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

3645 commits

Author SHA1 Message Date
Weblate
3ecaae04bc Merge branch 'origin/develop' into Weblate. 2020-06-26 12:37:09 +00:00
SBiOSoftWhare
48d2cae892 Fix merge issue with secure backup refactoring. 2020-06-26 14:36:27 +02:00
SBiOSoftWhare
6858bd85a5 Merge branch 'develop' into riot_3293 
# Conflicts:
#	CHANGES.rst
#	Riot/Generated/Strings.swift
 2020-06-26 14:30:21 +02:00
SBiOSoftWhare
77b726189b Refactoring secure backup references. 2020-06-26 14:13:37 +02:00
SBiOSoftWhare
e5bdd8cdef Refactoring secure backup references. 2020-06-26 14:01:33 +02:00
SBiOSoftWhare
123faa56ac Refactoring secure backup references. 2020-06-26 13:07:53 +02:00
Weblate
27525ecd90 Merge branch 'origin/develop' into Weblate. 2020-06-26 10:45:05 +00:00
manuroe
b17add8130
Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:43:26 +02:00
manuroe
b5a0b7cca3
Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:38:58 +02:00
manuroe
e64cd272d8
Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:36:57 +02:00
manuroe
2b7e71fda8 AuthenticatedSessionViewControllerFactory: Update with Steve's remarks 2020-06-26 12:29:30 +02:00
manuroe
7de6dcf2fd
Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:22:43 +02:00
manuroe
b35c372339
Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:21:41 +02:00
manuroe
e979a9c003
Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:21:34 +02:00
manuroe
f0d91282d5
Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:21:24 +02:00
manuroe
c3818a0997
Update Riot/Modules/AuthenticatedSession/AuthenticatedSessionViewControllerFactory.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-26 12:21:16 +02:00
manuroe
bfdd061d67 SecurityVC: Start cleaning 2020-06-26 07:56:56 +02:00
manuroe
d0de69976e AuthenticatedSessionViewControllerFactory: Add hasSupport 2020-06-26 07:56:10 +02:00
manuroe
d8b09a8e42 Security: Plug UX for cross-signing setup 
part of #3299
 2020-06-26 07:42:37 +02:00
manuroe
c162cb6a78 Add AuthenticatedSessionViewControllerFactory to set up a authenticated flow for a given CS API request 2020-06-26 07:38:38 +02:00
manuroe
26995effcb SecurityVC: Plug Secure Backup setup flow 2020-06-25 20:23:40 +02:00
Weblate
865386ec3f Merge branch 'origin/develop' into Weblate. 2020-06-25 15:56:47 +00:00
random
11c55e7525 Translated using Weblate (Italian) 
Currently translated at 100.0% (1029 of 1029 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/it/
 2020-06-25 15:56:47 +00:00
Kévin C
98d1fba466 Translated using Weblate (French) 
Currently translated at 100.0% (1029 of 1029 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/fr/
 2020-06-25 15:56:44 +00:00
Slavi Pantaleev
b22f14fcb4 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1029 of 1029 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/bg/
 2020-06-25 15:56:42 +00:00
SBiOSoftWhare
c625ea42af Fix refactoring. 2020-06-25 17:52:36 +02:00
SBiOSoftWhare
d7dbd13cf8 Fix Manu's remarks. 2020-06-25 17:31:46 +02:00
manuroe
4207ec4be2 Merge branch 'develop' into riot_3296 2020-06-25 17:20:47 +02:00
manuroe
7f024a6236
Update Riot/Modules/Settings/Security/SecurityViewController.m 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-25 17:17:04 +02:00
manuroe
37f69da7ec
Update Riot/Modules/Settings/Security/SecurityViewController.m 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-25 17:16:51 +02:00
manuroe
1e564672c1
Update Riot/Modules/Settings/Security/SecurityViewController.m 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-25 17:16:44 +02:00
manuroe
af3ca7c92b
Update Riot/Modules/Settings/Security/SecurityViewController.m 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-25 17:16:32 +02:00
manuroe
f62e08778d
Update Riot/Modules/Settings/Security/SecurityViewController.m 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-25 17:16:25 +02:00
manuroe
7b72eb59ba
Update Riot/Modules/Settings/Security/SecurityViewController.m 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-25 17:16:03 +02:00
SBiOSoftWhare
9c060902c9 AuthenticationViewController: Fix refact. 2020-06-25 16:30:47 +02:00
SBiOSoftWhare
de1efde09e RecentsDataSource: Handle secure key backup banner display logic. 2020-06-25 16:01:32 +02:00
SBiOSoftWhare
4a74b09245 MXSession: Add convenient method to check if we can setup secure key backup. 2020-06-25 15:58:52 +02:00
SBiOSoftWhare
8e1259ffa3 HomeVC: Handle secure setup key backup flow presentation. 2020-06-25 11:47:52 +02:00
SBiOSoftWhare
994d64ca20 MXSession+Riot: Use vc prefix as other extensions. 2020-06-25 10:23:24 +02:00
SBiOSoftWhare
f180ef30f1 Key backup banner: Update UI and strings. 2020-06-25 09:50:44 +02:00
SBiOSoftWhare
8c6b4c56b0 Key backup banner: Update localizable strings. 2020-06-25 09:45:29 +02:00
Weblate
f01f972005 Merge branch 'origin/develop' into Weblate. 2020-06-24 19:58:01 +00:00
AnchelNL
3949fbbb43 Translated using Weblate (Dutch) 
Currently translated at 72.6% (731 of 1007 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/nl/
 2020-06-24 19:58:01 +00:00
SBiOSoftWhare
d4f1aef1fc
Merge branch 'develop' into riot_3344 2020-06-24 21:57:37 +02:00
SBiOSoftWhare
cd8c353972 Fix Nad's remarks. 2020-06-24 18:29:52 +02:00
Besnik Bleta
0a72f4d4ed Translated using Weblate (Albanian) 
Currently translated at 99.2% (999 of 1007 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/sq/
 2020-06-24 16:26:33 +00:00
manuroe
612fd7268d E2E by default: Do not bootstrap cross-signing automatically 
if hs setting is disabled
 2020-06-24 17:09:23 +02:00
manuroe
3159131651 E2E by default: Disable it if the HS admin disabled it 
#3305
 2020-06-24 17:08:14 +02:00
manuroe
1aa1de5d1c SecurityVC: Use NEW_CROSS_SIGNING_FLOW to not break things 2020-06-24 11:43:50 +02:00
manuroe
82acfd106c SecurityVC: Add warning if we do not have the MSK 2020-06-24 11:43:50 +02:00