Commit Graph

2777 Commits

Author SHA1 Message Date
David Baker d1e7173383 Don't show dialog on cancel if self-verifying
The user should know they cancelled in if they're self verifying since
they're the one who cancelled, from their other device (the copy referred
to 'the other party', so was inaccurate, so we may as well just remove it).
2021-07-09 16:38:25 +01:00
Doug 0fdffe56c2 Add decryptNotificationsByDefault build setting. 2021-07-09 15:00:03 +01:00
Doug f7c5279416 Remove headers from PeopleViewController. 2021-07-09 14:22:33 +01:00
Doug 81110387ed Merge branch 'develop' into doug/4483_fix_picking_slow_mo_videos 2021-07-09 11:17:44 +01:00
David Langley 3167895271 Merge pull request #4458 from vector-im/roomNotificationSettings 2021-07-08 21:29:00 +01:00
langleyd bbf93f5c2b Fix logging, add "Notify me for" label, fix theme on avatar and add changes 2021-07-08 20:54:32 +01:00
Doug aa5b71b97b Fix sending a video selected from a document picker. 2021-07-08 17:41:55 +01:00
Doug 65e293f546 Send videos from the camera as AVURLAsset objects. 2021-07-08 16:55:32 +01:00
Doug 459936e076 Use AVAsset instead of NSURL to enable sending slow motion videos.
Slow motion videos are returned as AVComposition objects when picked. which lacks a URL property.
2021-07-08 16:26:19 +01:00
Doug 74eacae32c Fix documentation. 2021-07-08 12:28:52 +01:00
Doug 06c2f6b2bd Rename roomsCount and moreThanRoomsCount to indicate they are for search results.
Redefine roomsCount as the number of fetched rooms in the data source.
2021-07-08 12:16:05 +01:00
Doug 083e940fbe Remove headers from RoomsViewController. 2021-07-07 17:37:33 +01:00
Doug 990da54907 Remove uninitialised header views. 2021-07-07 15:05:40 +01:00
Doug 9bcbeffc50 Remove custom section header for room directory from RecentsDataSource. 2021-07-07 14:31:52 +01:00
Doug 70777bbb94 Remove any logic from directory section from RoomsViewController.
Includes removal of segue to DirectoryServerPickerViewController in Main.storyboard.
2021-07-07 12:58:11 +01:00
Doug 1123d356b7 Don't include directorySection in RecentsDataSource when in RecentsDataSourceModeRooms mode. 2021-07-07 11:48:23 +01:00
ismailgulek ddfb0da611 Merge branch 'develop' into element_4471 2021-07-07 12:26:43 +03:00
Gil Eluard c2302ac81c #4090 - Update after review 2021-07-06 23:03:56 +02:00
langleyd 943904fbf7 Use theme font types 2021-07-06 21:10:42 +01:00
langleyd 9225b910c7 Merge branch 'develop' of github.com:vector-im/element-ios into roomNotificationSettings 2021-07-06 19:51:17 +01:00
langleyd e99fb4eff7 Fix typos, naming and copywright 2021-07-06 19:39:15 +01:00
Doug 38ddc1c18f Merge branch 'develop' into doug/4515_fix_video_thumbnail_orientation 2021-07-06 17:47:47 +01:00
Doug 61e02323ba Tidy up PeopleViewController data source methods. 2021-07-06 17:43:16 +01:00
Doug 620417e84d Remove check. 2021-07-06 16:37:11 +01:00
Doug d99e7ce7b5 Begin removing contacts section from PeopleViewController. 2021-07-06 16:14:32 +01:00
David Baker af14fb31d1 Merge remote-tracking branch 'origin/develop' into dbkr/scan_button_title 2021-07-06 15:36:14 +01:00
Gil Eluard bcd7648bba Update Riot/Modules/Room/RoomViewController.m
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
2021-07-06 15:17:22 +02:00
langleyd a23d81e483 Keep old mute behaviour enabled on slide menu and long press when new build setting is not enabled. 2021-07-06 11:59:54 +01:00
langleyd dc94122634 Fix build, mute bug and footer label on unencrypted builds 2021-07-06 11:38:29 +01:00
Doug 295596c117 Generate video thumbnails with the correct orientation. 2021-07-06 10:41:47 +01:00
Gil Eluard 4f4c18d667 Merge branch 'develop' into element_4090
# Conflicts:
#	CHANGES.rst
2021-07-06 09:27:28 +02:00
Gil Eluard fc10f906ae MXKeyBackup: trustForKeyBackupVersionFromCryptoQueue must consider MSK trust
- code tweaks and optimizations
2021-07-06 08:57:51 +02:00
Doug 9ace275068 Fix crash when running on macOS with Apple Silicon. 2021-07-05 19:19:51 +01:00
langleyd d24e0c220d spacing and cleanup dead code 2021-07-05 16:49:06 +01:00
langleyd 526a7500df Fix build and naming of State -> ViewData 2021-07-05 16:28:14 +01:00
Doug 8be53ebad3 Show encrypted message notification content by default. 2021-07-05 15:27:52 +01:00
langleyd dcc12d36e5 Fix service naming 2021-07-04 17:27:19 +01:00
langleyd 5d6bf6d8fe Change in behaviour: mute should actually mean mute on update now. 2021-07-04 17:06:19 +01:00
langleyd d225adfc47 Add ViewModel tests and change avatar data to use existing AvatarViewDataProtocol 2021-07-04 17:01:42 +01:00
langleyd 83d98c077d Add avatar view and title 2021-07-04 10:46:17 +01:00
langleyd 8bfef45c9e Add entry points at long press on home view and slide on recents. 2021-07-02 20:19:46 +01:00
David Baker 5dbd7f1f5a Use different title for scan button for self verification
Because it's not 'their' device, it's your own device.
2021-07-02 17:38:12 +01:00
SBiOSoftWhare 3a8f656b40 TabBarCoordinator: Prepare room filtering on MasterTabBarController. 2021-07-02 18:36:14 +02:00
SBiOSoftWhare eafc9cb960 MasterTabBarController: Add a filterRoomsWithParentId method that should filter rooms for each tab data source with the given room parent id. 2021-07-02 18:35:29 +02:00
Doug 4353687e61 Fix SwiftLint warnings. 2021-07-02 17:13:45 +01:00
Doug f76db0baa4 Fix documentation warnings. 2021-07-02 16:46:27 +01:00
langleyd b858b769ba Update theming and footer 2021-07-02 16:16:54 +01:00
SBiOSoftWhare f86b2745c4 AppCoordinator: Update space switch. 2021-07-02 16:50:28 +02:00
SBiOSoftWhare 79cc70d963 SideMenuCoordinator: Hide side menu when selecting a space. 2021-07-02 16:49:02 +02:00
SBiOSoftWhare ab2d32e02a SplitViewCoordinator: Handle space switch. 2021-07-02 16:48:05 +02:00