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

9405 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ismailgulek
d57c464c8a Keep a reference to last navigated roomId from push 2020-09-23 16:53:00 +03:00
ismailgulek
409082a891 Remove the method not used anymore 2020-09-23 13:36:49 +03:00
ismailgulek
c29554a596 Stop using a cell for basic info, remove unneccessary GroupedTableViewCell 2020-09-23 13:35:34 +03:00
ismailgulek
784f724179 Convert to RoomInfoBasicViewData 2020-09-23 12:46:33 +03:00
ismailgulek
8a5df8da6e Create RoomInfoListViewData 2020-09-23 12:33:44 +03:00
ismailgulek
7da1be6f87 Move segmented view controller to coordinator 2020-09-23 12:18:37 +03:00
ismailgulek
4f2955226f Move leave alert to view controller 2020-09-23 12:06:36 +03:00
ismailgulek
54efe255fc Rename TableViewHeaderFooterView 2020-09-23 11:48:26 +03:00
ismailgulek
ba6c9be372 Use a constant for section & footer height 2020-09-23 11:45:10 +03:00
ismailgulek
5c18b46e68 Change rowHeight 2020-09-23 11:42:52 +03:00
ismailgulek
5031f0e7da Update row & section variable names 2020-09-23 11:40:28 +03:00
ismailgulek
b0abfdd03e Use CloseButton 2020-09-23 11:37:08 +03:00
ismailgulek
693f1a1146 Remove SimpleCoordinator 2020-09-23 11:14:14 +03:00
ismailgulek
e5f511117b Change loc key 2020-09-23 11:06:53 +03:00
ismailgulek
8648a95aeb Merge branch 'develop' into hide_push_content_on_pin_protection 2020-09-22 14:23:15 +03:00
ismailgulek
91bce1f60d Merge branch 'develop' into new_room_settings 2020-09-22 14:22:47 +03:00
ismailgulek
3a6173a9bd
Merge branch 'develop' into theme_fixes 2020-09-22 14:19:55 +03:00