Commit Graph

2954 Commits

Author SHA1 Message Date
ismailgulek a9e47668e1 Wording for room ID 2020-09-25 13:46:20 +03:00
ismailgulek f1198af772 Wording for no local addresses 2020-09-25 13:44:39 +03:00
ismailgulek ef29d69896 Wording for listing in directory 2020-09-25 13:43:02 +03:00
ismailgulek a790692c20 Wording for access string, including guests 2020-09-25 13:41:10 +03:00
ismailgulek 28399f6e32 Wording for access string, apart from guests 2020-09-25 13:39:50 +03:00
ismailgulek aae42d95e0 Wording for room access section header 2020-09-25 13:36:42 +03:00
ismailgulek 20785bc368 Wording for room name 2020-09-25 13:34:11 +03:00
ismailgulek eb59b6ab3b Wording for room photo 2020-09-25 13:32:34 +03:00
ismailgulek 2c155d53e8 Wording for search placeholder 2020-09-25 13:30:52 +03:00
ismailgulek 755b37212c Wording for room details 2020-09-25 13:30:36 +03:00
ismailgulek e85b4412da Merge branch 'develop' into wording_for_dm 2020-09-25 11:59:51 +03:00
manuroe f856b1f317 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 7f14187b7b Add missing comment 2020-09-25 10:14:14 +02:00
manuroe 47e77b7ff6 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 c033f4f235 Merge branch 'develop' into complete_security_allow_device_verification_retry 2020-09-25 09:24:25 +02:00
manuroe 6bad40781a KeyVerificationSelfVerifyWait: Listen to all verification requests not only the first one 2020-09-25 09:03:43 +02:00
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 aa22c7c006 Update Riot/Modules/SplitView/SplitViewCoordinatorType.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2020-09-24 15:10:48 +02:00
ismailgulek 14a492843d Merge branch 'develop' into convert_to_coordinators
# Conflicts:
#	CHANGES.rst
2020-09-24 14:13:53 +03:00
ismailgulek 10db9638f1 Update encryption strings 2020-09-24 13:27:53 +03: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 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 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 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 4a60dd524d Override user interface style for effect views 2020-09-22 14:17:40 +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
ismailgulek 486bbb35d4 Fix choose avatar image bg color 2020-09-21 17:59:04 +03:00
ismailgulek 2fd6d2ed7b Disable interactive dismissal when presented over room settings 2020-09-21 17:06:32 +03:00