Commit Graph

12250 Commits

Author SHA1 Message Date
manuroe 8d0837ee7c 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 fcd5a7ca84 Fix review remarks. 2020-09-24 16:25:10 +02:00
SBiOSoftWhare fbcdab09f9 MasterTabBarController: Update delegate method name. 2020-09-24 15:55:59 +02:00
SBiOSoftWhare 5bc8bc4aeb Update Riot/Modules/SplitView/SplitViewCoordinator.swift
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
2020-09-24 15:42:40 +02:00
SBiOSoftWhare 4ee2d367c3 Update Riot/Modules/SplitView/SplitViewCoordinator.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2020-09-24 15:16:51 +02:00
SBiOSoftWhare 5049d6e76e Update Riot/Modules/SplitView/SplitViewCoordinatorType.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2020-09-24 15:16:06 +02:00
SBiOSoftWhare ee77304e38 Update Riot/Routers/RootRouter.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2020-09-24 15:11:23 +02:00
SBiOSoftWhare 56c2d440cd Update Riot/Routers/RootRouterType.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2020-09-24 15:11:11 +02:00
SBiOSoftWhare 9de2260783 Update Riot/Routers/RootRouterType.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2020-09-24 15:10:59 +02:00
SBiOSoftWhare aa22c7c006 Update Riot/Modules/SplitView/SplitViewCoordinatorType.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2020-09-24 15:10:48 +02:00
SBiOSoftWhare 6ae43d4c4e Merge pull request #3682 from RiotTranslateBot/weblate-riot-ios-riot-ios
Update from Weblate
2020-09-24 14:24:03 +02:00
Weblate 8677f722ea Merge branch 'origin/develop' into Weblate. 2020-09-24 12:17:18 +00:00
ismailgulek 14a492843d Merge branch 'develop' into convert_to_coordinators
# Conflicts:
#	CHANGES.rst
2020-09-24 14:13:53 +03:00
SBiOSoftWhare 5dbdb85028 Fix changes. 2020-09-24 12:32:29 +02:00
ismailgulek 10db9638f1 Update encryption strings 2020-09-24 13:27:53 +03:00
SBiOSoftWhare bfb6a5db51 FlowTemplateCoordinatorBridgePresenter: Update class comment. 2020-09-24 12:15:36 +02:00
ismailgulek d69b2184cb Update leave strings 2020-09-24 13:00:50 +03:00
SBiOSoftWhare 67032a9d2e Add additional comments on SplitView and TabBar coordinators. 2020-09-24 12:00:21 +02:00
ismailgulek 2feba65be4 Remove redundant string 2020-09-24 12:41:25 +03:00
SBiOSoftWhare 65f4237ae0 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 0244a53573 Merge pull request #3670 from vector-im/new_room_settings
New Room Settings
2020-09-23 20:06:23 +03:00
Marcelo Filho 361b007fa0 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 981b857a0f 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 53bedc9c63 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 4a945082a7 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 588cbe934d Update CHANGES.rst 2020-09-23 16:54:41 +03:00
ismailgulek c53ddf8870 Force reload data source when opened from a push 2020-09-23 16:53:40 +03:00
ismailgulek 2214c78d8d Keep a reference to last navigated roomId from push 2020-09-23 16:53:00 +03:00
ismailgulek efab88fac0 Remove the method not used anymore 2020-09-23 13:36:49 +03:00
ismailgulek 7ab0cfe3b0 Stop using a cell for basic info, remove unneccessary GroupedTableViewCell 2020-09-23 13:35:34 +03:00
ismailgulek 4681b8685a Convert to RoomInfoBasicViewData 2020-09-23 12:46:33 +03:00
ismailgulek cfc991236c Create RoomInfoListViewData 2020-09-23 12:33:44 +03:00
ismailgulek e0dfb6b6b3 Move segmented view controller to coordinator 2020-09-23 12:18:37 +03:00
ismailgulek 86e56aaacb Move leave alert to view controller 2020-09-23 12:06:36 +03:00
ismailgulek 84b5d79eed Rename TableViewHeaderFooterView 2020-09-23 11:48:26 +03:00
ismailgulek f9af1d09e8 Use a constant for section & footer height 2020-09-23 11:45:10 +03:00
ismailgulek 4fde44cee1 Change rowHeight 2020-09-23 11:42:52 +03:00
ismailgulek 9c33616b0d Update row & section variable names 2020-09-23 11:40:28 +03:00
ismailgulek 4c57271b97 Use CloseButton 2020-09-23 11:37:08 +03:00
ismailgulek 823082bfea Remove SimpleCoordinator 2020-09-23 11:14:14 +03:00
ismailgulek 4a1e186f56 Change loc key 2020-09-23 11:06:53 +03:00
ismailgulek 878333ae29 Merge branch 'develop' into hide_push_content_on_pin_protection 2020-09-22 14:23:15 +03:00
ismailgulek 6c58eb2b8f Merge branch 'develop' into new_room_settings 2020-09-22 14:22:47 +03:00
ismailgulek 615fd73e13 Merge branch 'develop' into theme_fixes 2020-09-22 14:19:55 +03:00
ismailgulek 2e169399ab Update CHANGES.rst 2020-09-22 14:18:06 +03:00
ismailgulek 4a60dd524d Override user interface style for effect views 2020-09-22 14:17:40 +03:00
ismailgulek 061526f893 Add userInterfaceStyle on Theme 2020-09-22 14:17:20 +03:00
ismailgulek 9533ed38fa Merge pull request #3675 from vector-im/fix_fab_images
Fix Fab Images
2020-09-22 01:23:21 +03:00
ismailgulek aff86d9197 Change group name 2020-09-21 18:12:37 +03:00
ismailgulek 2c27a7d022 Fix room cell 2020-09-21 18:12:08 +03:00