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
Gil Eluard
09548c3624
Merge pull request #4543 from vector-im/gil/element_4438
...
it's easy for the back button to trigger a leftpanel reveal (#4438 )
2021-07-12 10:53:19 +02:00
Gil Eluard
f8e89b99ea
it's easy for the back button to trigger a leftpanel reveal ( #4438 )
...
- Reverted Riot.xcscheme
2021-07-10 00:01:47 +02:00
Gil Eluard
169435f63e
it's easy for the back button to trigger a leftpanel reveal ( #4438 )
...
- Updated CHANGES.rst
2021-07-09 23:58:32 +02:00
Gil Eluard
31f02a543d
it's easy for the back button to trigger a leftpanel reveal ( #4438 )
...
- Updated CHANGES.rst
2021-07-09 23:57:34 +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
6fc2f0ca41
Merge pull request #4525 from vector-im/dbkr/scan_button_title
...
Use different title for scan button for self verification
2021-07-09 19:44:17 +01: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
cd6e88dfea
Remove conditional_binding_cascade rule.
...
No longer supported in SwiftLint.
2021-07-09 16:35:39 +01:00
Doug
27672d40c2
Merge branch 'develop' into doug/4483_fix_picking_slow_mo_videos
2021-07-09 11:17:44 +01:00
Doug
99b5286ed7
Update CHANGES.rst.
2021-07-09 11:04:00 +01:00
Doug
b9ea5d4be9
Update to use sendVideoAsset: on MXRoom.
2021-07-09 10:26:02 +01:00
David Langley
ccf2b797cb
Merge pull request #4540 from vector-im/element_4539
...
Update template copyright date
2021-07-09 09:50:44 +01:00
langleyd
239176067e
Update template copyright date
2021-07-09 09:08:42 +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
5257e82b1b
Fix sending videos from the share extension.
2021-07-08 17:16:54 +01:00
Doug
d95b182fda
Send videos from the camera as AVURLAsset objects.
2021-07-08 16:55:32 +01:00
Doug
fdb8d1ef8c
Merge pull request #4538 from vector-im/doug/4537_fix_show_directory_view_controller_rooms_count
...
Fix duplicate results in the rooms directory.
2021-07-08 16:34:36 +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
40d4527f0d
Update CHANGES.rst.
2021-07-08 12:17:42 +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
langleyd
88d816ddf2
disable new settings ui again
2021-07-06 22:46:31 +01: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
104fc26423
Merge pull request #4532 from vector-im/doug/4515_fix_video_thumbnail_orientation
...
Generate video thumbnails with the correct orientation.
2021-07-06 17:47:55 +01:00
Doug
77a65f9a57
Merge branch 'develop' into doug/4515_fix_video_thumbnail_orientation
2021-07-06 17:47:47 +01:00
David Baker
28594eb1f8
Merge remote-tracking branch 'origin/develop' into dbkr/scan_button_title
2021-07-06 15:36:14 +01:00
langleyd
f240fbf0d2
Enabled new room settings UI while I do ad hoc build
2021-07-06 13:14:15 +01: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
cf5b43faf9
Merge pull request #4531 from vector-im/doug/fix_macos_apple_silicon
...
Fix crash when running on macOS with Apple Silicon.
2021-07-06 11:10:47 +01:00
Doug
b05ab02b9a
Merge branch 'develop' into doug/fix_macos_apple_silicon
2021-07-06 11:10:39 +01:00
Doug
d59ea07dea
Generate video thumbnails with the correct orientation.
2021-07-06 10:41:47 +01:00
Doug
711bf0cb41
Merge pull request #4527 from vector-im/matthew/fix-more-iphone12-layout
...
enable extendedLayoutIncludesOpaqueBars on the other tabs (not just Home)
2021-07-06 10:14:37 +01:00
Doug
6799ae4b39
Merge branch 'develop' into matthew/fix-more-iphone12-layout
2021-07-06 10:13:59 +01:00
Doug
e4bf45496e
Merge branch 'develop' into doug/fix_macos_apple_silicon
2021-07-06 09:27:34 +01:00
ismailgulek
cb202db656
Merge pull request #4529 from vector-im/voip_fix_call_transfer
...
VoIP: Fix Call Transfer
2021-07-06 11:14:38 +03:00
Doug
2838223b75
Update CHANGES.rst.
2021-07-05 19:21:16 +01:00
Doug
019b2c1a70
Fix crash when running on macOS with Apple Silicon.
2021-07-05 19:19:51 +01:00
Doug
44dc2aaf41
Fix documentation warning.
2021-07-05 17:48:53 +01:00
langleyd
0fb949b294
spacing and cleanup dead code
2021-07-05 16:49:06 +01:00
