Commit Graph

2477 Commits

Author SHA1 Message Date
Stefan Ceriu 844d946432 Merge branch 'develop' into element_4090
# Conflicts:
#	CHANGES.rst
2021-07-13 11:30:16 +03:00
Stefan Ceriu 0d315dbe0f Revert "#4545 - Switch back to using multiple audio player instances, allow pausing when starting a new player."
This reverts commit 1a2a434d9dabf08caecdd9d6833abf02e2e77365.
2021-07-13 08:04:50 +03:00
Gil Eluard a803a025a4 Show / hide reset button in secrets recovery screen (#4546). 2021-07-12 22:51:56 +02:00
Doug cec15f8f1d Merge branch 'develop' into doug/fix_warnings
# Conflicts:
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
2021-07-12 17:54:34 +01:00
Doug ab9336d08b Merge pull request #4541 from vector-im/doug/4483_fix_picking_slow_mo_videos
Add support for sending slow motion videos
2021-07-12 16:26:48 +01:00
Doug 83e05d26ac Use updated methods in MatrixKit. 2021-07-12 14:02:29 +01:00
Stefan Ceriu b6b8ec7d9f #4094 - Fixed attachments caching layer not working accordingly. 2021-07-12 15:50:44 +03:00
Stefan Ceriu 9013fcb59f #4094 - Fix crash on concurrent access to waveform audio samples. 2021-07-12 15:31:18 +03:00
Stefan Ceriu 648eea312c #4545 - Switch back to using multiple audio player instances, allow pausing when starting a new player. 2021-07-12 15:30:48 +03:00
Stefan Ceriu 436083ae8c #4094 - Disable message replies while recording audio messages. 2021-07-12 12:18:49 +03:00
Stefan Ceriu f95155e3e3 #4094 - Reduced the minimum recording duration to 1 second. 2021-07-12 10:18:01 +03:00
Gil Eluard 67613cffa2 #4090 - Update after review 2021-07-10 00:16:23 +02:00
Gil Eluard b1d4f2dd37 it's easy for the back button to trigger a leftpanel reveal (#4438)
- Fixed
2021-07-09 23:54:25 +02:00
Doug 87f3cad5cf Fix typo in comments. 2021-07-09 17:58:27 +01:00
Doug a4075c89cb 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 84b8a56f9d Merge remote-tracking branch 'origin/develop' into dbkr/scan_button_title 2021-07-09 16:40:16 +01:00
David Baker a8938f4794 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 afd4d16696 Add decryptNotificationsByDefault build setting. 2021-07-09 15:00:03 +01:00
Doug 51fc0afa08 Remove headers from PeopleViewController. 2021-07-09 14:22:33 +01:00
Doug 27672d40c2 Merge branch 'develop' into doug/4483_fix_picking_slow_mo_videos 2021-07-09 11:17:44 +01:00
David Langley 83e151b017 Merge pull request #4458 from vector-im/roomNotificationSettings 2021-07-08 21:29:00 +01:00
langleyd 816513cee6 Fix logging, add "Notify me for" label, fix theme on avatar and add changes 2021-07-08 20:54:32 +01:00
Doug ba8123c73a Fix sending a video selected from a document picker. 2021-07-08 17:41:55 +01:00
Doug d95b182fda Send videos from the camera as AVURLAsset objects. 2021-07-08 16:55:32 +01:00
Doug 6f1d7080f0 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 2566650431 Fix documentation. 2021-07-08 12:28:52 +01:00
Doug 0fee0e5c86 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 ca69e1a38a Remove headers from RoomsViewController. 2021-07-07 17:37:33 +01:00
Doug 6efff0af1d Remove uninitialised header views. 2021-07-07 15:05:40 +01:00
Doug b8a4a526b3 Remove custom section header for room directory from RecentsDataSource. 2021-07-07 14:31:52 +01:00
Doug e51b62244e 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 542533aa1b Don't include directorySection in RecentsDataSource when in RecentsDataSourceModeRooms mode. 2021-07-07 11:48:23 +01:00
ismailgulek 9c81dacef2 Merge branch 'develop' into element_4471 2021-07-07 12:26:43 +03:00
Gil Eluard 36cefffd7e #4090 - Update after review 2021-07-06 23:03:56 +02:00
langleyd 4c824cfced Use theme font types 2021-07-06 21:10:42 +01:00
langleyd 87710ca8c3 Merge branch 'develop' of github.com:vector-im/element-ios into roomNotificationSettings 2021-07-06 19:51:17 +01:00
langleyd 8a2425aaa7 Fix typos, naming and copywright 2021-07-06 19:39:15 +01:00
Doug 77a65f9a57 Merge branch 'develop' into doug/4515_fix_video_thumbnail_orientation 2021-07-06 17:47:47 +01:00
Doug 5a51311ecf Tidy up PeopleViewController data source methods. 2021-07-06 17:43:16 +01:00
Doug 888c8a4c0b Remove check. 2021-07-06 16:37:11 +01:00
Doug eb2a53ff7b Begin removing contacts section from PeopleViewController. 2021-07-06 16:14:32 +01:00
David Baker 28594eb1f8 Merge remote-tracking branch 'origin/develop' into dbkr/scan_button_title 2021-07-06 15:36:14 +01:00
Gil Eluard 41f8cc6b0f Update Riot/Modules/Room/RoomViewController.m
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
2021-07-06 15:17:22 +02:00
langleyd fe6a1953bd 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 97496f93ea Fix build, mute bug and footer label on unencrypted builds 2021-07-06 11:38:29 +01:00
Doug d59ea07dea Generate video thumbnails with the correct orientation. 2021-07-06 10:41:47 +01:00
Gil Eluard dc935897fb Merge branch 'develop' into element_4090
# Conflicts:
#	CHANGES.rst
2021-07-06 09:27:28 +02:00
Gil Eluard 5d3c40ad7a MXKeyBackup: trustForKeyBackupVersionFromCryptoQueue must consider MSK trust
- code tweaks and optimizations
2021-07-06 08:57:51 +02:00
Doug 019b2c1a70 Fix crash when running on macOS with Apple Silicon. 2021-07-05 19:19:51 +01:00
langleyd 0fb949b294 spacing and cleanup dead code 2021-07-05 16:49:06 +01:00