Commit Graph

2954 Commits

Author SHA1 Message Date
SBiOSoftWhare a717fd7e96 Bot: Disable bot creation for the moment. 2020-07-08 17:34:50 +02:00
SBiOSoftWhare 44e1efb728 RoomsVC: Update swipe actions for iOS 11+ and use new icons. 2020-07-07 02:30:51 +02:00
SBiOSoftWhare 6125cd5054 HomeVC: Room actions, update icons and add background corner radius. 2020-07-07 02:29:41 +02:00
SBiOSoftWhare 820a6ba949 RoomActivitiesView: Remove separator and change default background color. 2020-07-06 20:54:02 +02:00
SBiOSoftWhare 8d8c869ea6 Room input toolbars: Hide separator. 2020-07-06 20:51:04 +02:00
SBiOSoftWhare d5ede6c0de RoomContextualMenuToolbarView: Hide separator. 2020-07-06 20:49:38 +02:00
Steve Barré 29d337034a Merge branch 'update_colors' into 'rebranding'
Update colors

See merge request new-vector/element/element-ios!8
2020-07-06 18:36:07 +00:00
Ismail Gulek fa24ee9329 Read urls from defaults 2020-07-03 16:38:14 +03:00
ismailgulek 2c9f55ab08 Show confirmation alert if given and visible urls different, when tapped a link in a message cell, fixes #3137 2020-07-03 14:23:44 +03:00
SBiOSoftWhare 8bd12d6049 RoomTitleView: Update theme colors. 2020-07-02 19:06:14 +02:00
SBiOSoftWhare 9038467661 RoomMemberDetailsViewController: Update theme colors. 2020-07-02 19:04:06 +02:00
ismailgulek 7881b246bd Fix leading constraint, fixes #3226 2020-07-02 16:12:44 +03:00
Ismail Gulek 80ceef8c85 Update placeholders in KeyVerificationManuallyVerifyViewController 2020-07-01 16:20:32 +03:00
ismailgulek 31c89bf4f8 Merge branch 'develop' into xcode11
# Conflicts:
#	CHANGES.rst
#	Gemfile.lock
#	Riot.xcodeproj/project.pbxproj
#	Riot/SupportingFiles/Info.plist
#	RiotShareExtension/SupportingFiles/Info.plist
#	SiriIntents/Info.plist
2020-07-01 09:59:29 +03:00
SBiOSoftWhare 365b68a505 Merge pull request #3375 from vector-im/copy_update
SecurityVC: Update MY SESSIONS copy
2020-06-30 21:50:52 +02:00
SBiOSoftWhare 5f192cda7a Merge pull request #3377 from vector-im/riot_3299
Setup cross-signing for existing users
2020-06-30 21:47:36 +02:00
SBiOSoftWhare ece9e77cd8 Refactor cross signing banner. 2020-06-30 21:46:10 +02:00
SBiOSoftWhare aaca353748 KeyVerificationService: Fix canSetupKeyVerification. 2020-06-30 19:37:13 +02:00
SBiOSoftWhare 1ae3175326 AuthenticatedSessionViewControllerFactory: Add a discardableResult on viewController(forPath method. 2020-06-30 18:44:55 +02:00
SBiOSoftWhare 6c3be01a6e HomeVC: Handle key verification setup banner. 2020-06-30 18:44:14 +02:00
manuroe c05eb10491 SecurityVC: Update MY SESSIONS copy 2020-06-30 18:12:50 +02:00
manuroe 082d03be2e Sign out: Make sure there is a secure backup 2020-06-30 18:00:56 +02:00
SBiOSoftWhare 044853ad06 KeyVerificationService: Add canSetupKeyVerification method. 2020-06-30 17:33:42 +02:00
SBiOSoftWhare 9c66b5428b RecentsDataSource: Handle key verification setup banner. 2020-06-30 17:33:42 +02:00
SBiOSoftWhare 9c9e01cb76 Cross-signing: Create key verification setup banner. 2020-06-30 17:33:42 +02:00
manuroe 759ad91e9f SecurityVC: Setup cross-signing on secure backup setup 2020-06-30 17:03:33 +02:00
manuroe 52f3605914 SecurityVC: 3 actions for secure backup: setup, synchronise, delete 2020-06-30 16:23:29 +02:00
manuroe fc55dfb55c SecurityVC: Hide the cross-signing section 2020-06-30 15:56:05 +02:00
manuroe 13cbfc9741 SecurityVC: Secure backup replaces messages backup 2020-06-30 15:54:58 +02:00
manuroe 15e2c0c90d Merge remote-tracking branch 'origin/riot_3361' into riot_3361 2020-06-30 14:32:16 +02:00
manuroe 84c96a4785 Secure backup: Fixed Stève's remarks 2020-06-30 14:32:12 +02:00
manuroe e8e40f1286 Update Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-30 14:31:22 +02:00
manuroe 353d56ac50 Secure backup setup: Manage the case when the user has already a key backup
but we do not have the private key
2020-06-30 14:15:18 +02:00
manuroe 06c21ecf06 Secure backup: Create and delete key backup with 4S 2020-06-30 14:02:47 +02:00
manuroe e2477bc9f4 AuthVC: Remove NEW_CROSS_SIGNING_FLOW
because we consider riot-web ready
2020-06-26 18:37:15 +02:00
ismailgulek 6c2c2faea2 Merge branch 'develop' into xcode11
# Conflicts:
#	CHANGES.rst
#	Riot.xcodeproj/project.pbxproj
2020-06-26 17:33:09 +03:00
SBiOSoftWhare a433e3647e Fix merge issue with secure backup refactoring. 2020-06-26 14:36:27 +02:00
SBiOSoftWhare b1908231f7 Merge branch 'develop' into riot_3293
# Conflicts:
#	CHANGES.rst
#	Riot/Generated/Strings.swift
2020-06-26 14:30:21 +02:00
SBiOSoftWhare dfb5627126 Refactoring secure backup references. 2020-06-26 14:13:37 +02:00
SBiOSoftWhare f353d69c14 Refactoring secure backup references. 2020-06-26 14:01:33 +02:00
SBiOSoftWhare f3f1654007 Refactoring secure backup references. 2020-06-26 13:07:53 +02:00
manuroe 6e6ea6b672 Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-26 12:43:26 +02:00
manuroe 34bf39679b Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-26 12:38:58 +02:00
manuroe 68642f150f Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-26 12:36:57 +02:00
manuroe f2d41b6b8c AuthenticatedSessionViewControllerFactory: Update with Steve's remarks 2020-06-26 12:29:30 +02:00
manuroe c00d482ba7 Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-26 12:22:43 +02:00
manuroe 2abecd28a6 Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-26 12:21:41 +02:00
manuroe 85c3921bbb Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-26 12:21:34 +02:00
manuroe d538a31847 Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-26 12:21:24 +02:00
manuroe bbdb8d790b Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-06-26 12:21:16 +02:00