Commit Graph

3256 Commits

Author SHA1 Message Date
Weblate 8d6311ce1b Merge branch 'origin/develop' into Weblate. 2020-04-16 08:23:48 +00:00
ismailgulek cd74a8f7aa Merge pull request #3107 from vector-im/riot_2993
DeactivateAccountViewController theme, fixes #2993
2020-04-16 11:23:43 +03:00
Weblate 98f698fa03 Merge branch 'origin/develop' into Weblate. 2020-04-16 07:33:03 +00:00
manuroe fd74d5ebac Merge pull request #3109 from vector-im/riot_3103
Remove LABS > Enable Cross-signing
2020-04-16 09:32:58 +02:00
manuroe 768044d42d Remove LABS > Enable Cross-signing 2020-04-15 23:17:10 +02:00
ismailgulek 671d836bff Update methods
Signed-off-by: ismailgulek <gulekismail@gmail.com>
2020-04-15 20:02:13 +03:00
ismailgulek ddc21bf612 DeactivateAccountViewController theme, fixes #2993
Signed-off-by: ismailgulek <gulekismail@gmail.com>
2020-04-15 18:45:46 +03:00
Weblate 553275e256 Merge branch 'origin/develop' into Weblate. 2020-04-15 08:41:54 +00:00
giomfo dcbec2ad6f Merge pull request #2900 from vector-im/giomfo/bugfix2899
Bug Fix Key backup banner is not hidden correctly
2020-04-15 10:41:48 +02:00
Weblate 0c0f82151e Merge branch 'origin/develop' into Weblate. 2020-04-14 13:55:22 +00:00
manuroe 0a3136d353 New Sign-in: Do not send key requests before completing the "security" 2020-04-14 12:55:25 +02:00
manuroe 00bf54502d KeyVerificationCoordinatorBridgePresenterDelegate: Add keyVerificationCoordinatorBridgePresenterDelegateDidCancel 2020-04-14 12:50:53 +02:00
giomfo df405fff83 Merge branch 'develop' into giomfo/bugfix2899 2020-04-13 14:53:31 +02:00
Weblate 08c132ade8 Merge branch 'origin/develop' into Weblate. 2020-04-08 16:37:41 +00:00
manuroe 04335035b9 Merge pull request #3079 from vector-im/rior_3053
Key Backup: Use private key if we have it
2020-04-08 18:37:37 +02:00
manuroe 21f2237af1 Merge remote-tracking branch 'origin/rior_3053' into rior_3053 2020-04-08 18:29:56 +02:00
manuroe 38e5a1220a Fix Steve's comment 2020-04-08 18:29:37 +02:00
manuroe 7ee6dea00a Update Riot/Modules/KeyBackup/Recover/PrivateKey/KeyBackupRecoverFromPrivateKeyViewState.swift
Co-Authored-By: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-04-08 18:25:42 +02:00
Weblate f2dfc7140e Merge branch 'origin/develop' into Weblate. 2020-04-08 15:59:12 +00:00
manuroe 14f707c2e5 Key Backup: Use legacy screens if the private key does not work 2020-04-08 16:48:12 +02:00
manuroe 641025fac4 Key Backup: Add a screen for recovering with the local private key 2020-04-08 15:52:04 +02:00
SBiOSoftWhare 955c399fd3 RoomVC: Handle title view encryption trust level badge image 2020-04-08 15:07:24 +02:00
SBiOSoftWhare b4f54dc8db RoomTitleView: Add badge image view. 2020-04-08 15:06:59 +02:00
SBiOSoftWhare c13439835a Use EncryptionTrustLevelBadgeImageHelper where needed. 2020-04-08 15:06:27 +02:00
SBiOSoftWhare dae52e6a6d Add an helper class for encryption trust level badge generation. 2020-04-08 15:05:11 +02:00
SBiOSoftWhare 203bc41865 RoomCollectionViewCell: Reduce trust level badge size. 2020-04-08 12:51:40 +02:00
SBiOSoftWhare 1a4c385eb7 ExpandedRoomTitleView: Reduce trust level badge size. 2020-04-08 12:42:12 +02:00
SBiOSoftWhare 7dbdb7f413 RoomMemberTitleView: Remove power level badge. 2020-04-08 12:38:55 +02:00
SBiOSoftWhare 824d751980 RoomMemberDetailsViewController: Add power level label instead of badge. 2020-04-08 12:37:52 +02:00
SBiOSoftWhare 64663310cc GroupParticipantsViewController: Handle power level label instead of badge. 2020-04-08 12:36:48 +02:00
SBiOSoftWhare 332d11ca89 RoomParticipantsViewController: Handle power level label instead of badge. 2020-04-08 12:36:34 +02:00
SBiOSoftWhare 9ce0d59442 ContactTableViewCell: Display power label instead of badge. 2020-04-08 12:35:18 +02:00
SBiOSoftWhare f21325cbd7 Add power level localizable strings. 2020-04-08 12:33:28 +02:00
SBiOSoftWhare 2124554889 RoomPowerLevel: Add dedicated file and convenient init. 2020-04-08 12:32:36 +02:00
Slavi Pantaleev 91993e5b2b Translated using Weblate (Bulgarian)
Currently translated at 100.0% (29 of 29 strings)

Translation: Riot iOS/Riot iOS (Push)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-push/bg/
2020-04-05 08:27:32 +00:00
Weblate f562870e62 Merge branch 'origin/develop' into Weblate. 2020-04-03 15:42:27 +00:00
SBiOSoftWhare 5f48b38123 AppDelegate: Centralize modal presentation code. Listen to new key verification request only for current session. Prevent new key verification request alert to be presented twice. 2020-04-03 16:33:56 +02:00
SBiOSoftWhare 2b41ec8edf AuthenticationViewController: Handle complete security screen presentation. 2020-04-03 16:30:06 +02:00
SBiOSoftWhare b97ae46a2e UserVerificationCoordinator: Update with new KeyVerificationCoordinator init. 2020-04-03 16:28:35 +02:00
SBiOSoftWhare 8f917b6090 KeyVerificationCoordinatorBridgePresenter: Handle complete security screen. 2020-04-03 16:27:10 +02:00
SBiOSoftWhare 1242451fca KeyVerificationCoordinator: Refactor and add a single init with a KeyVerificationFlow enum parameter. 2020-04-03 16:23:32 +02:00
SBiOSoftWhare 370951a2c6 Implement complete security screen. 2020-04-03 15:55:53 +02:00
Weblate 070558a5bf Merge branch 'origin/develop' into Weblate. 2020-04-01 13:57:35 +00:00
manuroe 845a97b240 Merge pull request #3039 from schultetwin/dont_exit_app_for_sso
AuthFallback: Stay in Riot App
2020-04-01 15:57:31 +02:00
Weblate 66108e0d09 Merge branch 'origin/develop' into Weblate. 2020-03-30 08:04:48 +00:00
SBiOSoftWhare 74351d2eee Merge branch 'develop' into riot_2918
# Conflicts:
#	Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewModel.swift
2020-03-30 09:55:40 +02:00
Weblate 02093ed855 Merge branch 'origin/develop' into Weblate. 2020-03-30 06:58:55 +00:00
manuroe 679fe40a74 Merge pull request #3048 from vector-im/riot_3046
RoomMember scree: Display the verify button even in non e2e rooms
2020-03-30 08:58:50 +02:00
Weblate 297763d952 Merge branch 'origin/develop' into Weblate. 2020-03-30 06:58:04 +00:00
manuroe 18edaa85a9 Fix unexpected cast 2020-03-27 17:39:11 +01:00