Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
11670 commits 46 branches 261 tags 144 MiB
Commit graph

11670 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
74122307ed Merge branch 'origin/develop' into Weblate. 2021-07-15 10:13:23 +00:00
Doug
389dc81c78
Merge pull request #4549 from vector-im/doug/4528_fix_share_extension_search_layout 
Fix share extension layout when searching
 2021-07-14 14:44:52 +01:00
Doug
61256a7383
Merge branch 'develop' into doug/4528_fix_share_extension_search_layout 2021-07-13 17:10:43 +01:00
Doug
1d4ca68186 Update CHANGES.rst. 2021-07-13 17:08:48 +01:00
Doug
86fa15bfa6 Fix layout bug in the share extension. 2021-07-13 16:54:30 +01:00
Doug
9db2956578
Merge pull request #4542 from vector-im/doug/fix_warnings 
Fix warnings
 2021-07-13 11:07:47 +01:00
Gil Eluard
ab60c2a203
Merge pull request #4548 from vector-im/gil/element_4546 
Show / hide reset button in secrets recovery screen (#4546).
 2021-07-13 10:43:33 +02:00
Doug
51bcf4acc2
Update CHANGES.rst 2021-07-13 09:32:38 +01:00
Gil Eluard
a650e49533 Show / hide reset button in secrets recovery screen (#4546). 2021-07-12 22:51:56 +02:00
Doug
989f19696d Merge branch 'develop' into doug/fix_warnings 
# Conflicts:
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
 2021-07-12 17:54:34 +01:00
Doug
3f15a44721
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
0cb3aaa267 Use updated methods in MatrixKit. 2021-07-12 14:02:29 +01:00
Gil Eluard
14b605cca8
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
e15d842e7b 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
61b5675896 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
27b72c5408 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
a929ceb32e it's easy for the back button to trigger a leftpanel reveal (#4438) 
- Fixed
 2021-07-09 23:54:25 +02:00
Doug
4e34cb0a9c
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
94e2aa307c
Fix typo in comments. 2021-07-09 17:58:27 +01:00
Doug
e2a9d3bb24 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
b11c935784 Merge remote-tracking branch 'origin/develop' into dbkr/scan_button_title 2021-07-09 16:40:16 +01:00
David Baker
0fae773503 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
a88d46d81f Remove conditional_binding_cascade rule. 
No longer supported in SwiftLint.
 2021-07-09 16:35:39 +01:00
HelaBasa
528d0412a5 Translated using Weblate (Sinhala) 
Currently translated at 1.2% (15 of 1233 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/si/
 2021-07-09 14:25:07 +00:00
Deleted User
d544402f0c Translated using Weblate (Norwegian Bokmål) 
Currently translated at 97.7% (1205 of 1233 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/nb_NO/
 2021-07-09 14:25:06 +00:00
Doug
39ff2cb13c
Merge branch 'develop' into doug/4483_fix_picking_slow_mo_videos 2021-07-09 11:17:44 +01:00
Doug
f09c18d264 Update CHANGES.rst. 2021-07-09 11:04:00 +01:00
Doug
e7c747f59d Update to use sendVideoAsset: on MXRoom. 2021-07-09 10:26:02 +01:00
David Langley
2fd286560d
Merge pull request #4540 from vector-im/element_4539 
Update template copyright date
 2021-07-09 09:50:44 +01:00
langleyd
6a5f8f6f4c Update template copyright date 2021-07-09 09:08:42 +01:00
David Langley
40431c025f
Merge pull request #4458 from vector-im/roomNotificationSettings 2021-07-08 21:29:00 +01:00
langleyd
9e7fb75a2f Fix logging, add "Notify me for" label, fix theme on avatar and add changes 2021-07-08 20:54:32 +01:00
Doug
9ec4f75083 Fix sending a video selected from a document picker. 2021-07-08 17:41:55 +01:00
Doug
7c1aa76768 Fix sending videos from the share extension. 2021-07-08 17:16:54 +01:00
Doug
e134648982 Send videos from the camera as AVURLAsset objects. 2021-07-08 16:55:32 +01:00
Doug
0ebb4535e3
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
0e2f07a232 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
ee05ea2004 Fix documentation. 2021-07-08 12:28:52 +01:00
Doug
ebaf3270d9 Update CHANGES.rst. 2021-07-08 12:17:42 +01:00
Doug
8fbcc9d347 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
a95c8d17da disable new settings ui again 2021-07-06 22:46:31 +01:00
langleyd
87d0819bc7 Use theme font types 2021-07-06 21:10:42 +01:00
langleyd
ef87cf1f90 Merge branch 'develop' of github.com:vector-im/element-ios into roomNotificationSettings 2021-07-06 19:51:17 +01:00
langleyd
bbcc2f027b Fix typos, naming and copywright 2021-07-06 19:39:15 +01:00
Doug
a40ccc29b6
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
37472cdcaa
Merge branch 'develop' into doug/4515_fix_video_thumbnail_orientation 2021-07-06 17:47:47 +01:00
David Baker
ed3f789a51 Merge remote-tracking branch 'origin/develop' into dbkr/scan_button_title 2021-07-06 15:36:14 +01:00
langleyd
15917907b7 Enabled new room settings UI while I do ad hoc build 2021-07-06 13:14:15 +01:00
langleyd
c75ff07fa5 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
fdfde0cc6b Fix build, mute bug and footer label on unencrypted builds 2021-07-06 11:38:29 +01:00