Commit Graph

11630 Commits

Author SHA1 Message Date
SBiOSoftWhare a1a47ff5a3 finish version++ 2021-07-16 17:26:45 +02:00
SBiOSoftWhare 158eab81dd finish version++ 2021-07-16 16:59:24 +02:00
SBiOSoftWhare 4649225639 Merge pull request #4562 from vector-im/release/1.4.6/release
Release 1.4.6
2021-07-16 16:57:59 +02:00
SBiOSoftWhare 647164eaf4 Merge branch 'release/1.4.6/master' into release/1.4.6/release 2021-07-16 15:24:23 +02:00
SBiOSoftWhare 6af882ac4c version++ 2021-07-16 15:13:45 +02:00
SBiOSoftWhare 4f9b05492e Changes: Restore 1.4.5 changes. 2021-07-15 20:11:39 +02:00
SBiOSoftWhare 28bf0c2aab Merge pull request #4557 from RiotTranslateBot/weblate-riot-ios-riot-ios
Translations update from Weblate
2021-07-15 12:28:08 +02:00
SBiOSoftWhare 0eb37f9b34 Merge pull request #4556 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
Translations update from Weblate
2021-07-15 12:26:41 +02:00
Doug 8590293a1a Merge pull request #4555 from vector-im/doug/4552_fix_attachment_view_mask
Fix image and video thumbnail masks on cell reuse.
2021-07-15 11:23:19 +01:00
Weblate f559b6424e Merge branch 'origin/develop' into Weblate. 2021-07-15 10:13:23 +00:00
Weblate f13beacc92 Merge branch 'origin/develop' into Weblate. 2021-07-15 10:13:15 +00:00
Doug 028d6eccfa Merge branch 'develop' into doug/4552_fix_attachment_view_mask 2021-07-15 09:34:27 +01:00
Doug e731c6d4b3 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 445db8ba78 Use the layer's corner radius rather than a custom mask.
This will ensure the mask bounds always match the view's size.
2021-07-14 10:37:54 +01:00
Doug fa1bbecf26 Always update the path of the attachmentView's mask to handle reuse. 2021-07-14 10:15:50 +01:00
TheBlueKingLP 651f424d67 Translated using Weblate (Japanese)
Currently translated at 91.4% (32 of 35 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-push/ja/
2021-07-13 16:25:04 +00:00
Doug c4929ce18d Merge branch 'develop' into doug/4528_fix_share_extension_search_layout 2021-07-13 17:10:43 +01:00
Doug 3d900e3068 Update CHANGES.rst. 2021-07-13 17:08:48 +01:00
Doug 7f0f419d67 Fix layout bug in the share extension. 2021-07-13 16:54:30 +01:00
Doug 5e14c559b5 Merge pull request #4542 from vector-im/doug/fix_warnings
Fix warnings
2021-07-13 11:07:47 +01:00
Gil Eluard 110e7f7c9e 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 caea8a936b Update CHANGES.rst 2021-07-13 09:32:38 +01:00
Gil Eluard 3ddc562fa7 Show / hide reset button in secrets recovery screen (#4546). 2021-07-12 22:51:56 +02:00
Doug 9eea959032 Merge branch 'develop' into doug/fix_warnings
# Conflicts:
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
2021-07-12 17:54:34 +01:00
Doug a92dc9a4b6 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 0d16d30149 Use updated methods in MatrixKit. 2021-07-12 14:02:29 +01:00
Gil Eluard a2ce4f056d 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 c57f4e40dc 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 683fc6faf1 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 df9e154dda 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 1995e321ee it's easy for the back button to trigger a leftpanel reveal (#4438)
- Fixed
2021-07-09 23:54:25 +02:00
Doug d4e4389c05 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 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 45f3a90a68 Remove conditional_binding_cascade rule.
No longer supported in SwiftLint.
2021-07-09 16:35:39 +01:00
HelaBasa d0ebf70181 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 07036389b3 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
Deleted User 3aac4af63d Translated using Weblate (Norwegian Bokmål)
Currently translated at 100.0% (35 of 35 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-push/nb_NO/
2021-07-09 13:25:03 +00:00
HelaBasa e13230992d Translated using Weblate (Sinhala)
Currently translated at 17.1% (6 of 35 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-push/si/
2021-07-09 13:25:03 +00:00
Doug 11ce585cf9 Merge branch 'develop' into doug/4483_fix_picking_slow_mo_videos 2021-07-09 11:17:44 +01:00
Doug cb81c905bc Update CHANGES.rst. 2021-07-09 11:04:00 +01:00
Doug e0d1641921 Update to use sendVideoAsset: on MXRoom. 2021-07-09 10:26:02 +01:00
David Langley 8526ac9c97 Merge pull request #4540 from vector-im/element_4539
Update template copyright date
2021-07-09 09:50:44 +01:00
langleyd e3c90d7370 Update template copyright date 2021-07-09 09:08:42 +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 3076c5f782 Fix sending videos from the share extension. 2021-07-08 17:16:54 +01:00