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
9472 commits 46 branches 261 tags 144 MiB
Commit graph

9472 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ismailgulek
3fb3f21090 Update CHANGES.rst 2020-09-25 14:55:01 +03:00
manuroe
f3992abe6b
Merge pull request #3685 from vector-im/complete_security_display_race 
Complete Security: Make sure the authentication flow display it if auth is not complete yet
 2020-09-25 13:54:16 +02: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
manuroe
4c67678bad
Merge pull request #3683 from vector-im/complete_security_allow_device_verification_retry 
Complete Security: Come back to the root screen if device verification is cancelled
 2020-09-25 11:13:09 +02: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
SBiOSoftWhare
2eab38ffd4
Merge pull request #3630 from vector-im/convert_to_coordinators 
Create a coordinator for some legacy screen flows (application, split view and tab bar)
 2020-09-25 09:20:40 +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
c78ef34f96
Update Riot/Routers/RootRouter.swift 
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
 2020-09-24 15:11:23 +02:00
SBiOSoftWhare
d783477f4f
Update Riot/Routers/RootRouterType.swift 
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
 2020-09-24 15:11:11 +02:00
SBiOSoftWhare
a02573c576
Update Riot/Routers/RootRouterType.swift 
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
 2020-09-24 15:10:59 +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
SBiOSoftWhare
8d4957220f
Merge pull request #3682 from RiotTranslateBot/weblate-riot-ios-riot-ios 
Update from Weblate
 2020-09-24 14:24:03 +02:00
Weblate
f9c9e7b7d9 Merge branch 'origin/develop' into Weblate. 2020-09-24 12:17:18 +00:00
ismailgulek
84c01e239c Merge branch 'develop' into convert_to_coordinators 
# Conflicts:
#	CHANGES.rst
 2020-09-24 14:13:53 +03:00
SBiOSoftWhare
e6b116b875 Fix changes. 2020-09-24 12:32:29 +02:00
ismailgulek
46b720a4c8 Update encryption strings 2020-09-24 13:27:53 +03:00
SBiOSoftWhare
0567a626da FlowTemplateCoordinatorBridgePresenter: Update class comment. 2020-09-24 12:15:36 +02: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
bb988463e2
Merge pull request #3670 from vector-im/new_room_settings 
New Room Settings
 2020-09-23 20:06:23 +03:00
Marcelo Filho
84433cf9d6 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (1075 of 1075 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/pt_BR/
 2020-09-23 17:04:54 +00:00
Priit Jõerüüt
baad9a57ce Translated using Weblate (Estonian) 
Currently translated at 100.0% (1076 of 1076 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/et/
 2020-09-23 17:04:54 +00: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
3d8ecd65be Update CHANGES.rst 2020-09-23 16:54:41 +03:00
ismailgulek
31a4a42d3f Force reload data source when opened from a push 2020-09-23 16:53:40 +03:00