Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-30 16:22:39 +00:00
Code Issues Projects Releases Packages Wiki Activity
8228 commits 46 branches 261 tags 144 MiB
Commit graph

8228 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
859b00b86c
Merge pull request #3363 from vector-im/sec_settings 
SecurityVC: Plug UX to set up cross-signing & secure backup
 2020-06-26 12:44:58 +02: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
manuroe
f926ca582d
Merge pull request #3357 from vector-im/riot_3296 
Security settings: No-design update to add secure backup management
 2020-06-25 17:56:32 +02: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
ismailgulek
632eeaaaea
Upgrade version to 0.12.6 2020-06-25 18:23:14 +03: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
62c191cabb Update changes 2020-06-25 16:04:01 +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
ismailgulek
2b5a236e4e
Merge pull request #3347 from vector-im/riot_3325 
New Fallback Content for Push Notifications
 2020-06-25 16:30:14 +03:00
ismailgulek
2988efc79b
Change fallback message for encrypted events 2020-06-25 15:14:57 +03:00
ismailgulek
d953632884
Change fallback contents to include room display name 2020-06-25 15:14:14 +03:00
ismailgulek
44721cb656
Merge branch 'xcode11' into riot_3325 
# Conflicts:
#	CHANGES.rst
 2020-06-25 14:26:10 +03:00
ismailgulek
8abe501ac2
Refactor fallback method name 2020-06-25 14:23:21 +03:00
ismailgulek
565caf9a7c
Refactor best attempt contents variable name 2020-06-25 14:22:16 +03:00
ismailgulek
b6fded100d
Include room display name in fallback content 2020-06-25 14:18:53 +03:00
SBiOSoftWhare
8e1259ffa3 HomeVC: Handle secure setup key backup flow presentation. 2020-06-25 11:47:52 +02:00
ismailgulek
2dd4b7dcc2
Pass also roomId to fetch and sync methods 2020-06-25 12:42:07 +03:00
ismailgulek
dcbdc5cdd1
Read badge from payload 2020-06-25 11:48:02 +03:00