Commit Graph

2629 Commits

Author SHA1 Message Date
Doug c2900b7dde Fix typo in comments. 2021-07-09 17:58:27 +01:00
Doug c411097256 Fix class keyword deprecation warnings everywhere!
Using 'class' keyword for protocol inheritance is deprecated; use 'AnyObject' instead
2021-07-09 17:05:43 +01:00
David Baker 783dc95f5f Merge remote-tracking branch 'origin/develop' into dbkr/scan_button_title 2021-07-09 16:40:16 +01:00
David Baker 5630a43757 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 4f16c3f8b5 Add decryptNotificationsByDefault build setting. 2021-07-09 15:00:03 +01:00
Doug 6cb2574879 Remove headers from PeopleViewController. 2021-07-09 14:22:33 +01:00
Doug 11ce585cf9 Merge branch 'develop' into doug/4483_fix_picking_slow_mo_videos 2021-07-09 11:17:44 +01:00
David Langley 4befba4fe8 Merge pull request #4458 from vector-im/roomNotificationSettings 2021-07-08 21:29:00 +01:00
langleyd 33ddec46d2 Fix logging, add "Notify me for" label, fix theme on avatar and add changes 2021-07-08 20:54:32 +01:00
Doug 1ca51de204 Fix sending a video selected from a document picker. 2021-07-08 17:41:55 +01:00
Doug d49e741ab7 Send videos from the camera as AVURLAsset objects. 2021-07-08 16:55:32 +01:00
Doug f53445dc24 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 7063978364 Fix documentation. 2021-07-08 12:28:52 +01:00
Doug 105b1c5bd7 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 19d25381d5 Remove headers from RoomsViewController. 2021-07-07 17:37:33 +01:00
Doug 3340f3bd72 Remove uninitialised header views. 2021-07-07 15:05:40 +01:00
Doug c2c53fab15 Remove custom section header for room directory from RecentsDataSource. 2021-07-07 14:31:52 +01:00
Doug 0aefc5db38 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 f9f3dad1fa Don't include directorySection in RecentsDataSource when in RecentsDataSourceModeRooms mode. 2021-07-07 11:48:23 +01:00
ismailgulek a3ec1b747e Merge branch 'develop' into element_4471 2021-07-07 12:26:43 +03:00
Gil Eluard 113fd85103 #4090 - Update after review 2021-07-06 23:03:56 +02:00
langleyd 687d5e403d Use theme font types 2021-07-06 21:10:42 +01:00
langleyd d2a0a35e7c Merge branch 'develop' of github.com:vector-im/element-ios into roomNotificationSettings 2021-07-06 19:51:17 +01:00
langleyd 152d87768a Fix typos, naming and copywright 2021-07-06 19:39:15 +01:00
Doug d69c00484b Merge branch 'develop' into doug/4515_fix_video_thumbnail_orientation 2021-07-06 17:47:47 +01:00
Doug b9b63ff03e Tidy up PeopleViewController data source methods. 2021-07-06 17:43:16 +01:00
Doug b5526e4496 Remove check. 2021-07-06 16:37:11 +01:00
Doug 0c5bbbe474 Begin removing contacts section from PeopleViewController. 2021-07-06 16:14:32 +01:00
David Baker 8744af255d Merge remote-tracking branch 'origin/develop' into dbkr/scan_button_title 2021-07-06 15:36:14 +01:00
Gil Eluard bc3de17825 Update Riot/Modules/Room/RoomViewController.m
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
2021-07-06 15:17:22 +02:00
langleyd 6a8c64ea5a 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 74d4356c89 Fix build, mute bug and footer label on unencrypted builds 2021-07-06 11:38:29 +01:00
Doug e74e292fcd Generate video thumbnails with the correct orientation. 2021-07-06 10:41:47 +01:00
Gil Eluard 3c010f117c Merge branch 'develop' into element_4090
# Conflicts:
#	CHANGES.rst
2021-07-06 09:27:28 +02:00
Gil Eluard b24879ac66 MXKeyBackup: trustForKeyBackupVersionFromCryptoQueue must consider MSK trust
- code tweaks and optimizations
2021-07-06 08:57:51 +02:00
Doug 07ec3d2f52 Fix crash when running on macOS with Apple Silicon. 2021-07-05 19:19:51 +01:00
langleyd dd3cab44e2 spacing and cleanup dead code 2021-07-05 16:49:06 +01:00
langleyd 5889742845 Fix build and naming of State -> ViewData 2021-07-05 16:28:14 +01:00
Doug d6c0be5a6b Show encrypted message notification content by default. 2021-07-05 15:27:52 +01:00
langleyd acb88ffa12 Fix service naming 2021-07-04 17:27:19 +01:00
langleyd 213bfc817d Change in behaviour: mute should actually mean mute on update now. 2021-07-04 17:06:19 +01:00
langleyd 8c515d8fd4 Add ViewModel tests and change avatar data to use existing AvatarViewDataProtocol 2021-07-04 17:01:42 +01:00
langleyd 34891e4853 Add avatar view and title 2021-07-04 10:46:17 +01:00
langleyd 6a48bacd36 Add entry points at long press on home view and slide on recents. 2021-07-02 20:19:46 +01:00
David Baker 0ae203936e 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 fd277bad03 TabBarCoordinator: Prepare room filtering on MasterTabBarController. 2021-07-02 18:36:14 +02:00
SBiOSoftWhare 8abe86a660 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 41c51f0f50 Fix SwiftLint warnings. 2021-07-02 17:13:45 +01:00
Doug 6575447f51 Fix documentation warnings. 2021-07-02 16:46:27 +01:00
langleyd 45cfcf3cc3 Update theming and footer 2021-07-02 16:16:54 +01:00