Commit graph

4698 commits

Author SHA1 Message Date
SBiOSoftWhare
b822da44cc Jitsi Well-Known: Add links to the documentation. 2020-11-02 15:34:53 +01:00
SBiOSoftWhare
fc517a683f Merge branch 'develop' into element_3655 2020-11-02 15:11:55 +01:00
Hakim Oubouali
bb84871c94 Translated using Weblate (Central Atlas Tamazight)
Currently translated at 39.3% (13 of 33 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-push/tzm/
2020-11-01 08:49:53 +00:00
Hakim Oubouali
4badbbce70 Added translation using Weblate (Central Atlas Tamazight) 2020-10-31 08:09:23 +00:00
Hakim Oubouali
d75310e984 Added translation using Weblate (Central Atlas Tamazight) 2020-10-31 08:04:33 +00:00
Hakim Oubouali
a6ee64ce67 Added translation using Weblate (Central Atlas Tamazight) 2020-10-31 08:01:41 +00:00
manuroe
054e5d2618 Update CHANGES after coming back to develop 2020-10-30 09:48:02 +01:00
manuroe
b7807f9f81 Merge branch 'develop' into xcode12 2020-10-30 09:43:04 +01:00
SBiOSoftWhare
ad85da3d1b JitsiViewController: Handle authenticated Jitsi widget when needed. 2020-10-28 00:00:23 +01:00
SBiOSoftWhare
0c1181fec9 JitsiService: Handle Jitsi JWT token generation. 2020-10-27 23:54:36 +01:00
SBiOSoftWhare
b8f6a81659 Create JitsiJWTTokenBuilder that creates a JWT token for jitsi openidtoken-jwt authentication. 2020-10-27 23:42:18 +01:00
SBiOSoftWhare
21171b6716 WidgetManager: Use JitsiService to generate Jitsi widget content. 2020-10-27 15:35:57 +01:00
SBiOSoftWhare
aafdf53598 JitsiService: Handle Well Known retrieval and Jitsi widget content creation. 2020-10-27 15:31:30 +01:00
SBiOSoftWhare
7902a66c07 JitsiWidgetData: Add authentication type field. 2020-10-27 15:30:15 +01:00
SBiOSoftWhare
3696f63890 Add Base32Coder class. 2020-10-27 15:27:27 +01:00
manuroe
dc1dbcd2af
Merge pull request #3763 from stragu/patch-1
fix typos in English UI messages
2020-10-27 10:37:14 +01:00
SBiOSoftWhare
894c4f88d0 Add Jitsi Well Known codable representation. 2020-10-27 10:16:39 +01:00
manuroe
c211bf3bc9 PIN: Fix code bypass on fast switching 2020-10-26 16:09:39 +01:00
manuroe
58d9f6d447 BuildSettings: Centralise RoomInputToolbar compression mode setting 2020-10-26 10:24:40 +01:00
dewi-g
70920736b7 Translated using Weblate (Czech)
Currently translated at 18.4% (208 of 1129 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/cs/
2020-10-23 14:49:52 +00:00
@a2sc:matrix.org
4640cdd547 Translated using Weblate (German)
Currently translated at 99.9% (1128 of 1129 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/de/
2020-10-23 14:49:52 +00:00
manuroe
e52a9f895e Update Gems 2020-10-23 13:54:46 +02:00
Priit Jõerüüt
d9394a95b3 Translated using Weblate (Estonian)
Currently translated at 100.0% (6 of 6 strings)

Translation: Element iOS/Element iOS (Dialogs)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-dialogs/et/
2020-10-22 21:49:49 +00:00
ismailgulek
09269e18ff Merge branch 'develop' into element_3579
# Conflicts:
#	CHANGES.rst
2020-10-22 17:30:54 +03:00
ismailgulek
66b24716df Rever background sync method 2020-10-22 17:26:25 +03:00
ismailgulek
0f5d23db2a
Merge pull request #3726 from vector-im/element_3570
Update Pods
2020-10-22 12:31:11 +03:00
Stéphane Guillou
cd75c832b1
fix two typos 2020-10-22 13:33:40 +10:00
ismailgulek
a2efe16aa7
Merge pull request #3755 from vector-im/crash_fixes
Crash fixes
2020-10-19 22:54:32 +03:00
ismailgulek
f59204eca9 Move removing back title to viewDidLoad 2020-10-19 22:37:28 +03:00
ismailgulek
a67f5dab95 Merge branch 'develop' into element_3579
# Conflicts:
#	CHANGES.rst
2020-10-19 16:59:19 +03:00
Slavi Pantaleev
9ce395932c Translated using Weblate (Bulgarian)
Currently translated at 100.0% (33 of 33 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-push/bg/
2020-10-19 10:04:34 +00:00
Slavi Pantaleev
40d5b97f9e Translated using Weblate (Bulgarian)
Currently translated at 100.0% (6 of 6 strings)

Translation: Element iOS/Element iOS (Dialogs)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-dialogs/bg/
2020-10-19 10:04:34 +00:00
Knugi
c2c6e172af Translated using Weblate (Chinese (Traditional))
Currently translated at 50.1% (566 of 1129 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/zh_Hant/
2020-10-19 05:04:39 +00:00
Priit Jõerüüt
a3051e0cfc Translated using Weblate (Estonian)
Currently translated at 100.0% (1129 of 1129 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/et/
2020-10-17 13:04:52 +00:00
LinAGKar
def7e725ed Translated using Weblate (Swedish)
Currently translated at 100.0% (1129 of 1129 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sv/
2020-10-17 13:04:51 +00:00
Vadim Nekhai
ba6a65731b Translated using Weblate (Ukrainian)
Currently translated at 18.8% (213 of 1129 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/uk/
2020-10-17 13:04:50 +00:00
Bartosz
b613816719 Translated using Weblate (Polish)
Currently translated at 67.9% (767 of 1129 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/pl/
2020-10-17 13:04:46 +00:00
Marcelo Filho
c9348e1067 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (1129 of 1129 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/pt_BR/
2020-10-17 13:04:45 +00:00
random
835647ae53 Translated using Weblate (Italian)
Currently translated at 100.0% (1129 of 1129 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/it/
2020-10-17 13:04:41 +00:00
Besnik Bleta
c31c26b6eb Translated using Weblate (Albanian)
Currently translated at 99.2% (1121 of 1129 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sq/
2020-10-17 13:04:40 +00:00
Szimszon
ccfe4c8724 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1129 of 1129 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/hu/
2020-10-17 13:04:38 +00:00
Nikita Epifanov
dc0c312ffa Translated using Weblate (Russian)
Currently translated at 100.0% (1129 of 1129 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/ru/
2020-10-17 13:04:37 +00:00
Vadim Nekhai
ddc9aabc59 Translated using Weblate (Russian)
Currently translated at 100.0% (1129 of 1129 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/ru/
2020-10-17 13:04:36 +00:00
sr093906
edc0011646 Translated using Weblate (Chinese (Simplified))
Currently translated at 88.1% (995 of 1129 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/zh_Hans/
2020-10-17 13:04:35 +00:00
Ismail Gulek
0344e86389 Translated using Weblate (Chinese (Simplified))
Currently translated at 88.1% (995 of 1129 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/zh_Hans/
2020-10-17 13:04:35 +00:00
@a2sc:matrix.org
4ea44063c3 Translated using Weblate (German)
Currently translated at 99.4% (1123 of 1129 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/de/
2020-10-17 13:04:34 +00:00
Ismail Gulek
6c478b9ada Translated using Weblate (German)
Currently translated at 99.4% (1123 of 1129 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/de/
2020-10-17 13:04:34 +00:00
ismailgulek
226f12bf15 Fix crash when navigating to a room member 2020-10-16 14:27:45 +03:00
ismailgulek
804c62bf17 Fix navigationBar transcluency in ContactDetailtsViewController 2020-10-16 13:41:24 +03:00
ismailgulek
9174e9630e
Merge branch 'develop' into element_3570 2020-10-16 11:52:12 +03:00
SBiOSoftWhare
01f0a6ccf3
Update Riot/Assets/en.lproj/Vector.strings
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2020-10-15 16:08:12 +02:00
SBiOSoftWhare
f725770586 Secure backup: Add possibility to not expose recovery key when creating a secure backup. 2020-10-15 15:27:26 +02:00
ismailgulek
e62e9dac8d Remove old segue identifiers and handling 2020-10-15 14:43:01 +03:00
ismailgulek
e4cdbf4fd0 Remove old segue identifiers and handling 2020-10-15 14:18:13 +03:00
ismailgulek
567d0bf1ba Fix crash when navigating to file search result 2020-10-15 14:17:37 +03:00
ismailgulek
ee124ebb43 Fix crash when navigating to message search result 2020-10-15 14:17:06 +03:00
manuroe
e05ffd1394
Merge pull request #3751 from vector-im/xs_reset_detection
Self-verification: Avoid UI race when switching modals
2020-10-14 16:24:40 +02:00
manuroe
74e4bb5c1b Self-verification: Avoid UI race when switching modals 2020-10-14 15:53:51 +02:00
Vadim Nekhai
15543535bb Translated using Weblate (Ukrainian)
Currently translated at 100.0% (33 of 33 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-push/uk/
2020-10-14 12:05:27 +00:00
LinAGKar
2dd213adaa Translated using Weblate (Swedish)
Currently translated at 100.0% (33 of 33 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-push/sv/
2020-10-14 12:05:26 +00:00
random
8cd1f6252b Translated using Weblate (Italian)
Currently translated at 100.0% (33 of 33 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-push/it/
2020-10-14 12:05:26 +00:00
@a2sc:matrix.org
6e33a116a6 Translated using Weblate (German)
Currently translated at 100.0% (33 of 33 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-push/de/
2020-10-14 12:05:26 +00:00
Besnik Bleta
b15321644e Translated using Weblate (Albanian)
Currently translated at 100.0% (33 of 33 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-push/sq/
2020-10-14 12:05:26 +00:00
ismailgulek
a02c098c19 Merge branch 'develop' into element_3579
# Conflicts:
#	CHANGES.rst
2020-10-14 11:31:01 +03:00
ismailgulek
7a5fc4f61e Make copy media configurable, pass it to the MatrixKit 2020-10-14 01:01:29 +03:00
manuroe
c618042a6a
Merge branch 'develop' into xs_reset_detection 2020-10-13 18:32:27 +02:00
manuroe
9d2f7f7b8b
Update Riot/Modules/Application/LegacyAppDelegate.m
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2020-10-13 18:32:00 +02:00
SBiOSoftWhare
305a11232b SecretsRecoveryCoordinator: Do not check existing key backup after secrets reset. 2020-10-13 18:04:24 +02:00
manuroe
e53e72e728 Self-verification: Add some priority in self verification modal
If a new device resets 4S and XS at login, we need to hide the "verify the login" modal and display "Verify this session" (with the new XS)
2020-10-13 18:04:21 +02:00
SBiOSoftWhare
2781851b39 SecureBackupSetupCoordinator: Add a boolean at init to handle or not existing key backup before setup secure backup. 2020-10-13 18:02:35 +02:00
SBiOSoftWhare
b41e2a22ac SecureBackupSetupIntroViewController: Handle SecureBackupSetupIntroViewModel. 2020-10-13 17:59:13 +02:00
SBiOSoftWhare
c9a2f14597 Create SecureBackupSetupIntroViewModel for SecureBackupSetupIntroViewController. 2020-10-13 17:57:59 +02:00
manuroe
4934f41667 Cross-signing: Detect when cross-signing keys have been changed 2020-10-13 17:15:47 +02:00
ismailgulek
a3e392560c Remove commented codes 2020-10-13 18:11:58 +03:00
ismailgulek
50eca8d3e4 Merge branch 'develop' into element_3579 2020-10-13 16:11:19 +03:00
SBiOSoftWhare
04fd516332 Self verification: Update complete security screen with new wording. 2020-10-13 10:46:42 +02:00
SBiOSoftWhare
da6020ba6c Self verification: Update complete security wording. 2020-10-13 10:45:56 +02:00
Vadim Nekhai
43219f3e0e Translated using Weblate (Ukrainian)
Currently translated at 100.0% (6 of 6 strings)

Translation: Element iOS/Element iOS (Dialogs)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-dialogs/uk/
2020-10-13 03:05:24 +00:00
ismailgulek
4aec136ec2 Use handling in MXKAccount 2020-10-12 21:52:21 +03:00
ismailgulek
386a9edc53 Improve SyncResponseStore 2020-10-12 17:27:06 +03:00
ismailgulek
db1bd7ffa6 Last changes 2020-10-12 12:57:00 +03:00
Priit Jõerüüt
00b271357e Translated using Weblate (Estonian)
Currently translated at 100.0% (33 of 33 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-push/et/
2020-10-11 22:05:22 +00:00
Nikita Epifanov
b5977cdde9 Translated using Weblate (Russian)
Currently translated at 100.0% (33 of 33 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-push/ru/
2020-10-10 21:05:21 +00:00
Marcelo Filho
0fb7578b06 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (33 of 33 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-push/pt_BR/
2020-10-10 21:05:21 +00:00
Szimszon
6b21d1323f Translated using Weblate (Hungarian)
Currently translated at 100.0% (33 of 33 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-push/hu/
2020-10-10 21:05:21 +00:00
ismailgulek
75c893e1bd Use MXKPasteboardManager.pasteboard on copy operations 2020-10-09 15:20:54 +03:00
ismailgulek
d0895ca9dd Use MXKAppSettings.pasteboard on copy operations 2020-10-09 13:58:54 +03:00
ismailgulek
51a901aaa6
Merge pull request #3735 from vector-im/add_members_fab
Room: Add FAB to invite members
2020-10-09 13:06:01 +03:00
ismailgulek
95a987d2f8 Use the new extension where appropriate 2020-10-09 12:40:46 +03:00
ismailgulek
6200e09484 Return image view instance as fab 2020-10-09 12:38:09 +03:00
ismailgulek
62487861c3 Remove old controls and add the fab 2020-10-09 12:27:26 +03:00
ismailgulek
a83b999c3a Add an extension methof for simplicity 2020-10-09 12:26:54 +03:00
ismailgulek
98ddfd018a Add icon 2020-10-09 12:26:31 +03:00
SBiOSoftWhare
a38a3e616b
Merge pull request #3734 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
Update from Weblate
2020-10-09 10:50:40 +02:00
Weblate
b38b46a16d Merge branch 'origin/develop' into Weblate. 2020-10-09 07:36:08 +00:00
Weblate
3b78ae0741 Merge branch 'origin/develop' into Weblate. 2020-10-09 07:34:54 +00:00
LinAGKar
ea19ded48b Translated using Weblate (Swedish)
Currently translated at 100.0% (1120 of 1120 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/sv/
2020-10-08 16:05:31 +00:00
random
aa4f3990c3 Translated using Weblate (Italian)
Currently translated at 100.0% (1120 of 1120 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/it/
2020-10-08 16:05:27 +00:00
Szimszon
ab662a8246 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1120 of 1120 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/hu/
2020-10-08 16:05:26 +00:00
spla
b6778f707c Translated using Weblate (Catalan)
Currently translated at 43.9% (492 of 1120 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/ca/
2020-10-08 16:05:22 +00:00
Besnik Bleta
676e67828f Translated using Weblate (Albanian)
Currently translated at 99.1% (1110 of 1120 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/sq/
2020-10-08 16:05:21 +00:00
manuroe
834cc7f41d Security screens: Update automatically shields when the trust changes. 2020-10-08 17:34:42 +02:00
spla
853bb3956c Translated using Weblate (Catalan)
Currently translated at 100.0% (32 of 32 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-push/ca/
2020-10-08 11:05:18 +00:00
ismailgulek
cee4ef8d93 Remove unnecessary layoutIfNeeded 2020-10-07 15:30:41 +03:00
ismailgulek
0e6a286fe0 Factorize layout of table header and footers 2020-10-07 15:26:58 +03:00
ismailgulek
f103637186 Read constants from an enum 2020-10-07 15:26:30 +03:00
ismailgulek
7752b9d8dd Apply design decisions 2020-10-06 22:48:04 +03:00
ismailgulek
2201529f0e Update SwiftGen 2020-10-06 17:55:03 +03:00
ismailgulek
1ef4bbb328 Use ReadMoreTextView for room tpic 2020-10-06 17:32:28 +03:00
ismailgulek
f9b29983be Add less string 2020-10-06 17:27:53 +03:00
ismailgulek
61f7d9be7b Add thirdparty license 2020-10-06 17:27:35 +03:00
ismailgulek
40f931baed Fix table view content size 2020-10-06 01:07:19 +03:00
ismailgulek
9d4a983a32 Fix layout to show all of the topic 2020-10-06 00:59:30 +03:00
ismailgulek
8e14d43a3f Replace label with a text view 2020-10-06 00:53:58 +03:00
@a2sc:matrix.org
1a68fab3d4 Translated using Weblate (German)
Currently translated at 99.9% (1119 of 1120 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/de/
2020-10-03 11:05:07 +00:00
ismailgulek
c646e016d7 Fix layout for small screens 2020-10-02 14:17:52 +03:00
Nikita Epifanov
0ce7d35d19 Translated using Weblate (Russian)
Currently translated at 100.0% (1120 of 1120 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/ru/
2020-10-02 09:05:08 +00:00
@a2sc:matrix.org
5ed51214dd Translated using Weblate (German)
Currently translated at 98.6% (1104 of 1120 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/de/
2020-10-02 09:05:07 +00:00
Priit Jõerüüt
ed002feea2 Translated using Weblate (Estonian)
Currently translated at 100.0% (1120 of 1120 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/et/
2020-10-02 09:05:06 +00:00
ismailgulek
a01e10a27f Fix grouping 2020-10-02 11:48:12 +03:00
ismailgulek
f6f5fc2b07 Fix theme 2020-10-02 11:39:19 +03:00
ismailgulek
376e5b306c
Merge branch 'develop' into element_3679 2020-10-01 19:06:33 +03:00
ismailgulek
891148d98f
Merge pull request #3709 from vector-im/handle_retry_on_biometrics
Handle Retry on Biometrics
2020-10-01 19:06:03 +03:00
manuroe
0c036e4cc2 MXSession: Make sure vc_canSetupSecureBackup is reusable
Put specific additional check out of this method
2020-10-01 16:46:32 +02:00
ismailgulek
7fb89c5d9c Add retry case 2020-10-01 17:44:30 +03:00
ismailgulek
d2d127fe12 Merge branch 'develop' into element_3679
# Conflicts:
#	CHANGES.rst
2020-10-01 17:21:57 +03:00
ismailgulek
2a00687798 Only collapse bubbles both have the roomCreate tag 2020-10-01 17:19:22 +03:00
ismailgulek
e11755afca Tag room creator's join event appropriately 2020-10-01 17:18:32 +03:00
SBiOSoftWhare
a4474bdeb3
Merge branch 'develop' into support-other-browsers 2020-10-01 15:46:11 +02:00
ismailgulek
02565f3d9a
Merge branch 'develop' into element_3677 2020-10-01 14:22:26 +03:00
ismailgulek
47f6198b91 Launch background sync after reporting the call 2020-10-01 14:04:30 +03:00
SBiOSoftWhare
c6c470c092 Settings: Improve new phone number cell UI. 2020-10-01 12:26:02 +02:00
ismailgulek
0a0031f691 Add doc for lastNavigatedRoomIdFromPush property 2020-10-01 12:45:10 +03:00
ismailgulek
fe3b318ab3 Merge branch 'develop' into element_3672 2020-10-01 12:37:00 +03:00
Aaron Raimist
b0a7cb979f
Merge branch 'develop' into support-other-browsers 2020-09-30 18:42:36 -05:00
SBiOSoftWhare
052d3ac9bc
Update Riot/Modules/Secrets/Reset/SecretsResetViewModel.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2020-09-30 18:31:07 +02:00
SBiOSoftWhare
71f86bff10
Update Riot/Modules/Secrets/Reset/SecretsResetViewModelType.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2020-09-30 18:30:53 +02:00
SBiOSoftWhare
637e943ce7
Update Riot/Modules/Secrets/Reset/SecretsResetCoordinatorType.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2020-09-30 18:29:42 +02:00
Aaron Raimist
49e7aed444
Merge branch 'develop' into support-other-browsers 2020-09-30 10:51:44 -05:00
SBiOSoftWhare
1e9ab0fa8c Merge branch 'develop' into reset_4s 2020-09-30 17:51:28 +02:00
Aaron Raimist
457b910c46
Add http and https to LSApplicationQueriesSchemes
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-09-30 10:50:42 -05:00
SBiOSoftWhare
772ce79a85 KeyVerificationCoordinator: Fix child coordinator removal issue. 2020-09-30 17:50:20 +02:00
SBiOSoftWhare
a1f44f2420 SecretsRecoveryCoordinator: Handle secrets reset flow. 2020-09-30 17:48:55 +02:00
SBiOSoftWhare
7bacee6b96 SecureBackupSetupCoordinator: Handle existing navigation router. 2020-09-30 17:48:14 +02:00
SBiOSoftWhare
a3bb43e20f Secrets recovery with passphrase: Add reset action. 2020-09-30 17:45:26 +02:00
SBiOSoftWhare
1684d7a7a8 Secrets recover with key: Add reset action. 2020-09-30 17:44:25 +02:00
SBiOSoftWhare
eea6ba53f1 Create secrets reset screen. 2020-09-30 17:43:05 +02:00
SBiOSoftWhare
bd3934dfef Secrets reset: Add warning image. 2020-09-30 17:22:04 +02:00
SBiOSoftWhare
9d992fde5f Secrets reset: Add new strings. 2020-09-30 17:21:43 +02:00
ismailgulek
7018444e7d Merge branch 'develop' into element_3672
# Conflicts:
#	CHANGES.rst
2020-09-30 17:31:38 +03:00