Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-10-02 09:12:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
8037 commits 46 branches 261 tags 144 MiB
Commit graph

3589 commits

Author SHA1 Message Date
SBiOSoftWhare
7dfb43ce05 Fix commented code. 2020-04-28 20:36:23 +02:00
SBiOSoftWhare
3ce542cd80 Key verification: Update verified screen UI. 2020-04-28 20:27:48 +02:00
Weblate
595c86f0df Merge branch 'origin/develop' into Weblate. 2020-04-28 17:38:49 +00:00
ismailgulek
c3f8deb7ce
Fix Manu's comment 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-28 20:33:31 +03:00
ismailgulek
09c1e9cff9
Update Riot/Utils/UniversalLink.m 
Co-Authored-By: manuroe <manuroe@users.noreply.github.com>
 2020-04-28 20:21:51 +03:00
ismailgulek
91f6d724c8
Update Riot/Utils/UniversalLink.h 
Co-Authored-By: manuroe <manuroe@users.noreply.github.com>
 2020-04-28 20:21:40 +03:00
ismailgulek
f47e929ea7
Prefill email field on registrations 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-28 19:55:02 +03:00
Weblate
e250f16af4 Merge branch 'origin/develop' into Weblate. 2020-04-28 16:39:40 +00:00
manuroe
00f5cf11ad
Merge branch 'develop' into polish_not_verified 2020-04-28 18:39:20 +02:00
Weblate
281c531de8 Merge branch 'origin/develop' into Weblate. 2020-04-28 16:26:06 +00:00
manuroe
ab1454fe78 Verification: Do not talk about QR code if only emoji is possible 
#3035
 2020-04-28 18:16:37 +02:00
Weblate
6524a9ae84 Merge branch 'origin/develop' into Weblate. 2020-04-28 15:47:39 +00:00
random
e273250f3b Translated using Weblate (Italian) 
Currently translated at 100.0% (964 of 964 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/it/
 2020-04-28 15:47:39 +00:00
manuroe
7d8ccf9dfe Self-verification: Do not display incoming self verification requests at the top of the Complete Security screen. 2020-04-28 17:33:14 +02:00
manuroe
5453d27f39 Verification request : Hide incoming request modal when it is no more pending 
Fix #3033
 2020-04-28 17:30:04 +02:00
SBiOSoftWhare
c1d97f5a1f KeyVerificationVerifyBySASViewController: Update wording and UI. 2020-04-28 17:10:26 +02:00
SBiOSoftWhare
4b70a9c5ef Integrate RoundedButton where needed. 2020-04-28 16:34:39 +02:00
SBiOSoftWhare
ea46771fc1 Create custom RoundedButton. 2020-04-28 16:33:46 +02:00
manuroe
50ade944fc Security > Sessions: Display my unverified device with a red shield 2020-04-28 16:15:31 +02:00
Weblate
eabd868e62 Merge branch 'origin/develop' into Weblate. 2020-04-28 10:11:56 +00:00
Elwyn Malethan
2aa1a863bd Translated using Weblate (Welsh) 
Currently translated at 98.7% (950 of 963 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/cy/
 2020-04-28 10:11:56 +00:00
Kazu Hodota
c063ebab37 Translated using Weblate (Japanese) 
Currently translated at 51.2% (493 of 963 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/ja/
 2020-04-28 10:11:55 +00:00
random
dad06f3bb5 Translated using Weblate (Italian) 
Currently translated at 100.0% (963 of 963 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/it/
 2020-04-28 10:11:54 +00:00
Szimszon
65d16ec46f Translated using Weblate (Hungarian) 
Currently translated at 100.0% (963 of 963 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/hu/
 2020-04-28 10:11:53 +00:00
SoftCat
2af27b0ec2 Translated using Weblate (German) 
Currently translated at 96.1% (925 of 963 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/de/
 2020-04-28 10:11:52 +00:00
Kévin C
0496a88b39 Translated using Weblate (French) 
Currently translated at 100.0% (963 of 963 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/fr/
 2020-04-28 10:11:51 +00:00
Osoitz
219307012a Translated using Weblate (Basque) 
Currently translated at 100.0% (963 of 963 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/eu/
 2020-04-28 10:11:50 +00:00
Txopi
384a63bff0 Translated using Weblate (Basque) 
Currently translated at 100.0% (963 of 963 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/eu/
 2020-04-28 10:11:49 +00:00
SBiOSoftWhare
acf53b0e9c
Merge pull request #3164 from vector-im/riot_3162 
Key verification: Update key verification screens title. Update SAS screen wordings.
 2020-04-28 12:11:44 +02:00
SBiOSoftWhare
79be40e18d Update localizations. 2020-04-28 12:05:27 +02:00
manuroe
58a70cac79 Support email verification link from homeserver for email addition too 2020-04-28 12:04:47 +02:00
manuroe
d363fee2bd Registration: Support email verification link from homeserver 
#3167
 2020-04-28 11:22:04 +02:00
SBiOSoftWhare
ec9adb4030 KeyVerificationVerifyByScanningCoordinator: Remove a useless delegate method. 2020-04-28 11:16:01 +02:00
ismailgulek
699f7a924e
Remove login fallback to m.org when authentication failed 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-28 11:21:53 +03:00
SBiOSoftWhare
7ce9bbfcb0 Key verification: Update key verification screens title. Update SAS screen wordings. 2020-04-27 19:54:57 +02:00
SBiOSoftWhare
16772c8eec KeyVerificationKind: Add new cases. 2020-04-27 19:46:44 +02:00
SBiOSoftWhare
daa692461b Update key verification localizations 2020-04-27 19:46:21 +02:00
manuroe
d951f4e4f3 version++ 2020-04-24 19:07:41 +02:00
manuroe
fdc100c626 Cross-signing: Improve no bootstrap support copy a bit 2020-04-24 18:50:38 +02:00
manuroe
a7b61baab0 Security settings: Do not ask to complete security if there is no cross-signing 
Fix #3147
 2020-04-24 18:49:00 +02:00
Weblate
33032919a0 Merge branch 'origin/develop' into Weblate. 2020-04-24 14:58:29 +00:00
SBiOSoftWhare
fa2c46b500 Complete security: Update UI. 2020-04-24 16:24:21 +02:00
SBiOSoftWhare
c88ef8f549 UILabel: Add convenient method for setting line spacing. 2020-04-24 16:23:15 +02:00
SBiOSoftWhare
469d0d9839 Complete security: Add new assets. 2020-04-24 16:22:25 +02:00
SBiOSoftWhare
a0cff1496a Complete security: Add new localizations. 2020-04-24 16:21:51 +02:00
Weblate
e18b5bd89c Merge branch 'origin/develop' into Weblate. 2020-04-24 11:27:05 +00:00
manuroe
9242c0d9d2
Merge pull request #3151 from vector-im/riot_3150 
Make Jitsi widgets compatible with Matrix Widget API v2
 2020-04-24 13:27:00 +02:00
manuroe
aaba08e4ce Jitsi: Create jitsi widget with v2 style but stay compatible with v1 
We use `webAppUrl`and `jitsiServerURL` from the app plist for the url start (used only by web) and the default jitsi server
 2020-04-24 12:24:11 +02:00
Weblate
70c247bd55 Merge branch 'origin/develop' into Weblate. 2020-04-24 09:15:14 +00:00
random
6be22b39aa Translated using Weblate (Italian) 
Currently translated at 100.0% (958 of 958 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/it/
 2020-04-24 09:15:14 +00:00
Kévin C
b12222a62c Translated using Weblate (French) 
Currently translated at 100.0% (958 of 958 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/fr/
 2020-04-24 09:15:11 +00:00
manuroe
735f51d4ba Jitsi: Support v2 widget data. Open a conference on the provided domain 2020-04-24 11:09:01 +02:00
manuroe
71b3e167ef Jitsi: Support v1 and v2 widget types 2020-04-24 09:04:49 +02:00
Nad Chishtie
e8971331e0 Update selected icons to use better visually balanced weights 2020-04-23 23:53:30 +01:00
Nad Chishtie
7275ef3080 Update icons to use feather 2020-04-23 23:52:50 +01:00
Nad Chishtie
63d48db4ca Fix selected icon not being displayed in TabBar when Rooms is selected 2020-04-23 23:37:37 +01:00
Nad Chishtie
22a9418d58 Update icon assets to use feather 2020-04-23 23:37:11 +01:00
Weblate
412f671a7d Merge branch 'origin/develop' into Weblate. 2020-04-23 17:57:05 +00:00
ismailgulek
911eb38026
Merge pull request #3084 from vector-im/riot_3067 
Consider Safe Area Insets for Some Screens
 2020-04-23 20:56:58 +03:00
Weblate
ada1a8b51f Merge branch 'origin/develop' into Weblate. 2020-04-23 15:54:11 +00:00
manuroe
203c4b4206 Security - CROSS-SIGNING: Use "Complete security" to fix cross-signing 
Fix #3049
 2020-04-23 17:31:49 +02:00
manuroe
bb92d57725 Settings - Security: Fix missing i18n 2020-04-23 17:29:58 +02:00
manuroe
eb0bea54c2 Settings - Security: Move down the key backup section 
With cross-signing and SSSS, this section is less important.
 2020-04-23 16:46:44 +02:00
Weblate
de12e399f3 Merge branch 'origin/develop' into Weblate. 2020-04-23 14:08:36 +00:00
SBiOSoftWhare
3a07010593
Merge pull request #3145 from vector-im/riot_3127 
BF: Settings - Security: My device is not trusted
 2020-04-23 16:08:31 +02:00
SBiOSoftWhare
369a42f0e9 Update wording. 2020-04-23 16:02:18 +02:00
Weblate
ca331e440e Merge branch 'origin/develop' into Weblate. 2020-04-23 13:53:55 +00:00
Szimszon
254bde6e9e Translated using Weblate (Hungarian) 
Currently translated at 100.0% (948 of 948 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/hu/
 2020-04-23 13:53:54 +00:00
manuroe
26de5a9e65
Merge branch 'develop' into riot_3138 2020-04-23 15:53:15 +02:00
SBiOSoftWhare
28ad87c3c3 SecurityViewController: Show current device cannot cross sign show all devices with black shield and present complete security on tap. 2020-04-23 15:50:01 +02:00
manuroe
020fbc4ed6 Rename UserEncryptionTrustLevelNormal to UserEncryptionTrustLevelNotVerified 2020-04-23 15:25:43 +02:00
manuroe
38fd4fd831 Cross-signing: Allow to verify each device of users with no cross-signing 
Fix #3138
This is implemented by adding a new `UserEncryptionTrustLevel` value: `UserEncryptionTrustLevelNoCrossSigning`
 2020-04-23 15:10:41 +02:00
Weblate
0e7423f086 Merge branch 'origin/develop' into Weblate. 2020-04-23 12:28:27 +00:00
SBiOSoftWhare
ed99f45fa2 RoomMemberDetailsViewController: For current user present complete security when device is not trusted. 2020-04-23 11:58:19 +02:00
SBiOSoftWhare
4cd8c4f3fe Key verification: Add new state for complete security flow. 2020-04-23 11:55:19 +02:00
Weblate
6b2f0f4af4 Merge branch 'origin/develop' into Weblate. 2020-04-23 07:42:29 +00:00
manuroe
1a746a357b Cross-signing: Allow incoming device verification request from other user 
#3139
 2020-04-23 09:25:46 +02:00
manuroe
3313a88c5a 0.11.1 2020-04-23 08:57:09 +02:00
ismailgulek
9e01e22ad5
AuthenticationViewController scroll view respect to safe area 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 19:26:49 +03:00
ismailgulek
c642c41d09
Encryption info cell background color to safe area 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 17:02:29 +03:00
ismailgulek
58de3a7898
Some custom constraints on table view cells fixed for safe area 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 16:15:30 +03:00
ismailgulek
7dda136df7
SegmentedViewController table insets fix again 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 16:06:37 +03:00
ismailgulek
96d14035e2
Main.storyboard enable safe area layout guides 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 14:51:31 +03:00
ismailgulek
c5d8034518
Fix RecentsViewController after rebase again 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 14:51:00 +03:00
ismailgulek
1cb9829dcf
RoomParticipantsViewController extend table row under home indicator 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 14:00:32 +03:00
ismailgulek
8c6a179d11
ContactsTableViewController allow table row content be visible under home indicator 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 14:00:31 +03:00
ismailgulek
75eb8b05f8
RoomViewController set insets for jump button 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 14:00:31 +03:00
ismailgulek
2259f02e9b
RoomFilesViewController table view bottom inset reset bug fix 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 14:00:31 +03:00
ismailgulek
d632ee8499
RoomViewController navigation bar remaining translucent on some cases bug fix 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 14:00:31 +03:00
ismailgulek
a50358f9bb
Section header views adaptation to safe area insets 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 14:00:31 +03:00
ismailgulek
90ebc08e74
RoomViewController fix redundant space on table bottom 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 13:58:35 +03:00
ismailgulek
42590b3ba8
RecentsViewController plus button respect to safe area 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 13:58:35 +03:00
ismailgulek
e39e22b91e
StartChatViewController allow tableview content visible under home indicator 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 13:53:14 +03:00
ismailgulek
3f6dd1a2da
SegmentedViewController allow scrollview content to be visible under home indicator 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 13:53:13 +03:00
ismailgulek
cf29ff4349
RoomMemberDetailsViewController bug fix: navigationBar was remaining translucent 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 13:53:13 +03:00
ismailgulek
7d5b7f15a7
Bug fix: When navigating back from a child page using edgeScreenPanRecognizer, do not destroy child pages until navigation completed 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 13:53:13 +03:00
ismailgulek
ec9148fc18
SegmentedViewController bug fix: segments disappear when coming from a view with translucent bar 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 13:53:13 +03:00
ismailgulek
383438174f
RoomViewController bubblesTableView bottom constraint fix 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 13:53:13 +03:00
ismailgulek
4b409e236a
StartChatViewController safe area insets 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 13:53:12 +03:00
ismailgulek
c7fe30d194
RecentsViewController safe area insets 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 13:53:12 +03:00
ismailgulek
927081312c
Layout problem on back from UnifiedSearchViewController, enhancement for #3084 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 13:53:12 +03:00
ismailgulek
475deda512
Layout problem on back from RoomSearchViewController, fixes #3073 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 13:53:12 +03:00
ismailgulek
a2e35356e1
ContactsTableViewController safe area insets, fixes #3072 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 13:53:12 +03:00
ismailgulek
9a2bdef0f2
RecentsViewController searchBar safe area insets, fixes #3070 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 13:53:12 +03:00
ismailgulek
1376c6b27b
RoomParticipantsViewController safe area insets 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 13:53:12 +03:00
ismailgulek
0e2648ace3
ContactsTableViewController safe area insets 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 13:53:11 +03:00
ismailgulek
ac3f3b2aa4
RecentsViewController safe area insets 2020-04-22 13:53:11 +03:00
ismailgulek
3ea5a00bb5
SegmentedViewController safe area insets 2020-04-22 13:53:11 +03:00
ismailgulek
f753d97ba1
RoomViewController safe area insets 2020-04-22 13:53:11 +03:00
ismailgulek
578e240f0e
Button inset logic refactored and moved to statusBarDidChangeFrame 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 13:53:10 +03:00
ismailgulek
8f7b7fe232
AuthenticationViewController safe area insets 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 13:53:10 +03:00
ismailgulek
f3c4df833b
JitsiViewController safe area insets 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 13:53:10 +03:00
ismailgulek
5d9737f67b
Return to call button safe area insets 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 13:53:09 +03:00
ismailgulek
113a56825f
Call screen safe area insets 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-22 13:53:09 +03:00
Weblate
f83592c19a Merge branch 'origin/develop' into Weblate. 2020-04-22 08:05:38 +00:00
SBiOSoftWhare
4268246921 QR code verification: Remove other scan my code alert. 2020-04-21 18:57:05 +02:00
Weblate
4e35065f84 Merge branch 'origin/develop' into Weblate. 2020-04-21 15:24:23 +00:00
SBiOSoftWhare
881d81705b KeyVerificationVerifyByScanningViewController: Handle transaction cancel when QR code scanning is on screen. 2020-04-21 17:01:04 +02:00
SBiOSoftWhare
3e44c84057 KeyVerificationVerifyByScanningViewModel: Unregister transaction change when needed. 2020-04-21 17:00:24 +02:00
SBiOSoftWhare
8dc054781c QRCodeReaderViewController: Fix a crash after deinit (Fix #3125). 2020-04-21 16:58:24 +02:00
Weblate
7c4e0a0e52 Merge branch 'origin/develop' into Weblate. 2020-04-21 12:33:49 +00:00
inthepan
41422bdb30 Translated using Weblate (Swedish) 
Currently translated at 2.4% (23 of 947 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/sv/
 2020-04-21 12:33:49 +00:00
random
95c46a6265 Translated using Weblate (Italian) 
Currently translated at 100.0% (947 of 947 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/it/
 2020-04-21 12:33:48 +00:00
manuroe
f337e84888 Badges: Make Riot build again 2020-04-21 14:26:20 +02:00
inthepan
af27fbebb4 Added translation using Weblate (Swedish) 2020-04-21 12:09:40 +00:00
manuroe
5885616b6e
Merge pull request #3130 from RiotTranslateBot/weblate-riot-ios-riot-ios-push 
Update from Weblate
 2020-04-20 10:42:51 +02:00
manuroe
a3441b58ba
Merge pull request #3129 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs 
Update from Weblate
 2020-04-20 10:42:24 +02:00
Szimszon
a079575891 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (947 of 947 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/hu/
 2020-04-19 13:27:57 +00:00
Kévin C
428c7d13f4 Translated using Weblate (French) 
Currently translated at 100.0% (947 of 947 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/fr/
 2020-04-19 13:27:57 +00:00
Weblate
e86476f29b Merge branch 'origin/develop' into Weblate. 2020-04-17 14:05:52 +00:00
Weblate
bc547fe412 Merge branch 'origin/develop' into Weblate. 2020-04-17 14:05:52 +00:00
Weblate
2189bb2387 Merge branch 'origin/develop' into Weblate. 2020-04-17 14:05:51 +00:00
ismailgulek
df890f54ac
Update third_party_licences.hmtl 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-17 17:02:09 +03:00
ismailgulek
dfa74d4d5e
Set collectionView width to constant, to show only 4 items in a row 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-17 14:39:52 +03:00
ismailgulek
a94af7cb93
Use KTCenterFlowLayout for collection view layout, fixes #3088 
Signed-off-by: ismailgulek <gulekismail@gmail.com>
 2020-04-17 13:41:48 +03:00
Weblate
1f4fdff996 Merge branch 'origin/develop' into Weblate. 2020-04-17 09:48:55 +00:00
Besnik Bleta
3ebdeb9772 Translated using Weblate (Albanian) 
Currently translated at 99.5% (936 of 941 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/sq/
 2020-04-17 09:48:55 +00:00
Weblate
691f7889d7 Merge branch 'origin/develop' into Weblate. 2020-04-17 09:48:53 +00:00
Weblate
b907f560e2 Merge branch 'origin/develop' into Weblate. 2020-04-17 09:48:52 +00:00
SBiOSoftWhare
8948638c26
Merge pull request #3116 from vector-im/riot_3047 
QR code: Display scan confirmation screen
 2020-04-17 11:48:47 +02:00
SBiOSoftWhare
9709c67886 KeyVerificationCoordinator: Handle QR code confirmation screen. 2020-04-16 18:46:18 +02:00
SBiOSoftWhare
957fe93bd8 KeyVerification: Update scanning screen to handle new QR code confirmation state. 2020-04-16 18:45:46 +02:00
SBiOSoftWhare
ed42d8a3b8 KeyVerification: Add new QR code confirmation screen. 2020-04-16 18:42:14 +02:00
Weblate
525ddc8500 Merge branch 'origin/develop' into Weblate. 2020-04-16 08:23:48 +00:00
Weblate
bec4bbc5cb Merge branch 'origin/develop' into Weblate. 2020-04-16 08:23:48 +00:00
Weblate
ae49ba17ae Merge branch 'origin/develop' into Weblate. 2020-04-16 08:23:48 +00:00
ismailgulek
7852e5b34d
Merge pull request #3107 from vector-im/riot_2993 
DeactivateAccountViewController theme, fixes #2993
 2020-04-16 11:23:43 +03:00
Weblate
26b7f34be6 Merge branch 'origin/develop' into Weblate. 2020-04-16 07:33:03 +00:00
Weblate
ddc16a192a Merge branch 'origin/develop' into Weblate. 2020-04-16 07:33:03 +00:00
Weblate
1abf19c20a Merge branch 'origin/develop' into Weblate. 2020-04-16 07:33:03 +00:00