Commit Graph

6199 Commits

Author SHA1 Message Date
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 e0415e5a58 Update Riot/Assets/en.lproj/Vector.strings
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
2021-07-06 15:17:54 +02: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 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 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
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
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
langleyd 23884eb4c0 Fix build and naming of State -> ViewData 2021-07-05 16:28:14 +01:00
Doug 620b54583a Show encrypted message notification content by default. 2021-07-05 15:27:52 +01:00
ismailgulek d073d144d9 Do not present ended calls 2021-07-05 15:27:36 +03:00
Matthew Hodgson 62540cd0ca enable extendedLayoutIncludesOpaqueBars on the other tabs (not just Home)
to fix iPhone 12 Pro Max layout issues

fixes https://github.com/vector-im/element-ios/issues/4516
2021-07-04 21:11:12 +01:00
langleyd 64efc159ba Fix service naming 2021-07-04 17:27:19 +01:00
langleyd 5cacdac19e Change in behaviour: mute should actually mean mute on update now. 2021-07-04 17:06:19 +01:00
langleyd ff61a79ffb Add ViewModel tests and change avatar data to use existing AvatarViewDataProtocol 2021-07-04 17:01:42 +01:00
langleyd 7a2ba9dfb4 Add avatar view and title 2021-07-04 10:46:17 +01:00
Tim Al 80de420d45 Translated using Weblate (Dutch)
Currently translated at 100.0% (1233 of 1233 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/nl/
2021-07-03 11:34:49 +00:00
jelv a605fb17d1 Translated using Weblate (Dutch)
Currently translated at 100.0% (1233 of 1233 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/nl/
2021-07-03 11:34:49 +00:00
langleyd 3f7d45100c Add entry points at long press on home view and slide on recents. 2021-07-02 20:19:46 +01:00
David Baker 62abdf444f 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
Doug cf860049ef Fix SwiftLint warnings. 2021-07-02 17:13:45 +01:00
Doug 0f720e56d7 Fix documentation warnings. 2021-07-02 16:46:27 +01:00
langleyd ce5d53822b Update theming and footer 2021-07-02 16:16:54 +01:00
langleyd 9c42cb1aeb Fix naming of Repository -> Service, Impl -> Type 2021-07-02 10:39:27 +01:00
langleyd 8b52cda3f7 Fix typo and don't show link to account settings until we have global notification settings. 2021-07-02 10:30:44 +01:00
langleyd 0f10ffa7d7 Add translations, footer message and room encryption handling 2021-07-02 10:15:35 +01:00
Gil Eluard 1e3abae9c7 #4090 - Improved performances 2021-07-02 07:38:56 +02:00
ismailgulek 9d1de5bc29 Adapt Swifty session states 2021-06-30 18:02:11 +03:00
Doug 98b314305a Merge remote-tracking branch 'origin/develop' into element_4485
# Conflicts:
#	CHANGES.rst
2021-06-30 12:43:37 +01:00
Doug c2cce13730 Move authenticationActivityIndicator into a container.
Observe the indicator's hidden property to show and hide the container.
2021-06-30 12:33:43 +01:00
Weblate 33f4e83efb Merge branch 'origin/develop' into Weblate. 2021-06-30 09:30:49 +00:00
lvre b50973c1e5 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (1233 of 1233 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/pt_BR/
2021-06-30 09:30:42 +00:00
random aa0615e355 Translated using Weblate (Italian)
Currently translated at 100.0% (1233 of 1233 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/it/
2021-06-30 09:30:41 +00:00
ismailgulek 1ac89b7617 Merge pull request #4487 from vector-im/voip_audio_router_menu
VoIP: Audio Router Menu
2021-06-30 12:26:13 +03:00
Gil Eluard 424d57cb5c Merge branch 'develop' into element_4090 2021-06-30 09:22:18 +02:00
Gil Eluard adec2dc99b #4090 - fixed small theme issues 2021-06-29 17:05:01 +02:00
Gil Eluard b16d11e472 #4090 - bug fixing and removed work queue 2021-06-29 15:08:55 +02:00
ismailgulek dd84b33929 Adapt renaming 2021-06-29 15:10:16 +03:00