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

1416 commits

Author SHA1 Message Date
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
5f9356d1c0
Merge pull request #3690 from vector-im/settings_security_modularity 
SecurityViewController: Makes table content easier to customize
 2020-09-28 17:47:37 +02:00
SBiOSoftWhare
d489cb17d7 SecurityViewController: Reload sections on settingsKeyBackupTableViewSectionDidUpdate call. 2020-09-28 17:22:43 +02:00
SBiOSoftWhare
755c0bb9b7 ManageSessionViewController: Update getLabelAndSwitchCell method. 2020-09-28 17:05:58 +02:00
SBiOSoftWhare
cc6a3a4679 SecurityViewController: Fix switch button touch event reuse issue. 2020-09-28 17:05:11 +02:00
SBiOSoftWhare
6dce9a3340 SecurityViewController: Improve null safety check for keybackup section cells. 2020-09-28 16:21:41 +02:00
SBiOSoftWhare
28e93aba7a
Update Riot/Modules/Common/Models/Section.swift 
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
 2020-09-28 16:10:37 +02:00
SBiOSoftWhare
27f5938d5c
Update Riot/Modules/Settings/Security/SecurityViewController.m 
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
 2020-09-28 15:44:07 +02:00
SBiOSoftWhare
3e0242e117 SecurityViewController: Makes table content easier to customize. 2020-09-28 14:25:21 +02:00
SBiOSoftWhare
36210ad48d Section: Add a convenient method to add an amount of rows. 2020-09-28 14:23:39 +02:00
ismailgulek
7ed79429c3 Update localization keys 2020-09-28 12:51:34 +03:00
ismailgulek
65f6dfcc7b Merge branch 'develop' into wording_for_dm 2020-09-25 16:49:41 +03:00
ismailgulek
0c6a14f079 Hide room creation event in modal 2020-09-25 16:16:23 +03:00
manuroe
7fae7c287f Complete Security: Make sure the authentication flow display it if auth is not complete yet 
The complete security flow can be unfortunately triggered from 2 places: AuthVC and MasterTabBarC.

On a fresh app installation, during authentication, it was unexpectedly displayed from MasterTabBarC. This prevented authentication flow to complete. The app stayed on the launching animation.

This commit fixes this race.
 2020-09-25 13:06:34 +02:00
ismailgulek
c7ed3365b4 Wording for room ID 2020-09-25 13:46:20 +03:00
ismailgulek
869106aaef Wording for no local addresses 2020-09-25 13:44:39 +03:00
ismailgulek
e9cc2061ad Wording for listing in directory 2020-09-25 13:43:02 +03:00
ismailgulek
f93f2bb517 Wording for access string, including guests 2020-09-25 13:41:10 +03:00
ismailgulek
56b3fbc30d Wording for access string, apart from guests 2020-09-25 13:39:50 +03:00
ismailgulek
f35ee7a86c Wording for room access section header 2020-09-25 13:36:42 +03:00
ismailgulek
d79ceb2f60 Wording for room name 2020-09-25 13:34:11 +03:00
ismailgulek
4d393b96b8 Wording for room photo 2020-09-25 13:32:34 +03:00
ismailgulek
d35216e4ae Wording for search placeholder 2020-09-25 13:30:52 +03:00
ismailgulek
7ed1968705 Wording for room details 2020-09-25 13:30:36 +03:00
ismailgulek
78a8ec571b Merge branch 'develop' into wording_for_dm 2020-09-25 11:59:51 +03:00
manuroe
e31cc51416 Merge remote-tracking branch 'origin/complete_security_allow_device_verification_retry' into complete_security_allow_device_verification_retry 2020-09-25 10:14:27 +02:00
manuroe
87792b4064 Add missing comment 2020-09-25 10:14:14 +02:00
manuroe
d502956850
Update Riot/Modules/KeyVerification/Common/KeyVerificationCoordinator.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-09-25 10:10:06 +02:00
manuroe
7c1fa2f922
Merge branch 'develop' into complete_security_allow_device_verification_retry 2020-09-25 09:24:25 +02:00
manuroe
43081b52bc KeyVerificationSelfVerifyWait: Listen to all verification requests not only the first one 2020-09-25 09:03:43 +02:00
manuroe
b3c9cd26f6 Complete Security: Come back to the root screen if device verification is cancelled 
So that the user can retry to verify with another device
 2020-09-25 08:58:57 +02:00
SBiOSoftWhare
6ba5587bd0 Fix review remarks. 2020-09-24 16:25:10 +02:00
SBiOSoftWhare
8242af6c06 MasterTabBarController: Update delegate method name. 2020-09-24 15:55:59 +02:00
SBiOSoftWhare
0fad90a7ed
Update Riot/Modules/SplitView/SplitViewCoordinator.swift 
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
 2020-09-24 15:42:40 +02:00
SBiOSoftWhare
2c65633fb3
Update Riot/Modules/SplitView/SplitViewCoordinator.swift 
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
 2020-09-24 15:16:51 +02:00
SBiOSoftWhare
065e5f0c9a
Update Riot/Modules/SplitView/SplitViewCoordinatorType.swift 
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
 2020-09-24 15:16:06 +02:00
SBiOSoftWhare
b2da39cd9f
Update Riot/Modules/SplitView/SplitViewCoordinatorType.swift 
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
 2020-09-24 15:10:48 +02:00
ismailgulek
84c01e239c Merge branch 'develop' into convert_to_coordinators 
# Conflicts:
#	CHANGES.rst
 2020-09-24 14:13:53 +03:00
ismailgulek
46b720a4c8 Update encryption strings 2020-09-24 13:27:53 +03:00
ismailgulek
a665d2119e Update leave strings 2020-09-24 13:00:50 +03:00
SBiOSoftWhare
697a55aa41 Add additional comments on SplitView and TabBar coordinators. 2020-09-24 12:00:21 +02:00
ismailgulek
fba7604e37 Remove redundant string 2020-09-24 12:41:25 +03:00
SBiOSoftWhare
5ac652536b Merge branch 'develop' into convert_to_coordinators 
# Conflicts:
#	CHANGES.rst
#	Riot/Modules/TabBar/MasterTabBarController.h
#	Riot/Modules/TabBar/MasterTabBarController.m
 2020-09-24 11:37:24 +02:00
ismailgulek
037eb8ac7c
Update Riot/Modules/Room/RoomInfo/RoomInfoList/Views/RoomInfoBasicView.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-09-23 18:24:25 +03:00
ismailgulek
c6a3fcaedc
Update Riot/Modules/Room/RoomInfo/RoomInfoList/Views/RoomInfoBasicView.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-09-23 18:24:12 +03:00
ismailgulek
c29554a596 Stop using a cell for basic info, remove unneccessary GroupedTableViewCell 2020-09-23 13:35:34 +03:00