Commit Graph

7455 Commits

Author SHA1 Message Date
Weblate aac04c7506 Merge branch 'origin/develop' into Weblate. 2020-04-17 09:48:52 +00:00
SBiOSoftWhare 94cbea3e2c Merge pull request #3116 from vector-im/riot_3047
QR code: Display scan confirmation screen
2020-04-17 11:48:47 +02:00
SBiOSoftWhare 3628e45a62 KeyVerificationCoordinator: Handle QR code confirmation screen. 2020-04-16 18:46:18 +02:00
SBiOSoftWhare 9c82869754 KeyVerification: Update scanning screen to handle new QR code confirmation state. 2020-04-16 18:45:46 +02:00
SBiOSoftWhare 921e4f9a87 KeyVerification: Add new QR code confirmation screen. 2020-04-16 18:42:14 +02:00
Weblate 45cc1d8251 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 b97eb6e331 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 10c48e9634 Update CHANGES.rst
Signed-off-by: ismailgulek <gulekismail@gmail.com>
2020-04-15 18:48:26 +03:00
ismailgulek ddc21bf612 DeactivateAccountViewController theme, fixes #2993
Signed-off-by: ismailgulek <gulekismail@gmail.com>
2020-04-15 18:45:46 +03:00
Weblate cfa7c17a60 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 1c53d426f0 Merge branch 'origin/develop' into Weblate. 2020-04-14 13:55:22 +00:00
manuroe 0d8273e1ba Merge pull request #3099 from vector-im/riot_3089
New Sign-in: Do not send key requests before completing the "security"
2020-04-14 15:55:17 +02: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 77e81d24dc Merge branch 'origin/develop' into Weblate. 2020-04-09 12:38:08 +00:00
manuroe 062bd85b01 Merge pull request #3083 from vector-im/remove_swiftUTI_pod
SwiftUTI: Remove the no more maintained pod. Embed code instead
2020-04-09 14:38:03 +02:00
manuroe aad459cf9e SwiftUTI: Remove the no more maintained pod. Embed code instead 2020-04-09 14:31:26 +02:00
Weblate ccdf0fca44 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 fd7e5187f7 Merge branch 'origin/develop' into Weblate. 2020-04-08 15:59:12 +00:00
SBiOSoftWhare 1df58eb071 Merge pull request #3078 from vector-im/riot_2972
Make decoration uniform
2020-04-08 17:59:06 +02: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 024e45467f Update changes 2020-04-08 15:10:36 +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
manuroe de272fcd65 Templates: 2019 -> 2020 2020-04-08 14:05:54 +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
Weblate 81f45357d9 Merge branch 'origin/develop' into Weblate. 2020-04-03 15:42:27 +00:00
SBiOSoftWhare 40b673ffaa Merge pull request #3061 from vector-im/riot_3003
Cross-signing: Complete security at the end of sign in process
2020-04-03 17:42:22 +02:00
SBiOSoftWhare 05f2a7354e Update changes 2020-04-03 17:08:10 +02:00