Commit Graph

13178 Commits

Author SHA1 Message Date
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 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
Gil Eluard dc935897fb Merge branch 'develop' into element_4090
# Conflicts:
#	CHANGES.rst
2021-07-06 09:27:28 +02:00
Gil Eluard 8e74260b69 Updated CHANGES.rst 2021-07-06 09:22:22 +02:00
Gil Eluard 5d3c40ad7a MXKeyBackup: trustForKeyBackupVersionFromCryptoQueue must consider MSK trust
- code tweaks and optimizations
2021-07-06 08:57:51 +02: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
langleyd 23884eb4c0 Fix build and naming of State -> ViewData 2021-07-05 16:28:14 +01:00
Doug dbf633f187 Update CHANGES.rst. 2021-07-05 15:41:14 +01:00
Doug 620b54583a Show encrypted message notification content by default. 2021-07-05 15:27:52 +01:00
ismailgulek fea0d1bb2e Update CHANGES.rst 2021-07-05 15:30:43 +03:00
ismailgulek d073d144d9 Do not present ended calls 2021-07-05 15:27:36 +03:00
Doug 58ec6bb3c4 Remove background colour from RoomsLiveViewController. 2021-07-05 11:59:35 +01:00
Matthew Hodgson 508fb9441c changelog 2021-07-04 21:14:34 +01: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 1d7f6ad127 changelog 2021-07-02 17:41:40 +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
SBiOSoftWhare 72eb0dfa56 TabBarCoordinator: Prepare room filtering on MasterTabBarController. 2021-07-02 18:36:14 +02:00
SBiOSoftWhare 80a575929b MasterTabBarController: Add a filterRoomsWithParentId method that should filter rooms for each tab data source with the given room parent id. 2021-07-02 18:35:29 +02: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
SBiOSoftWhare d45812cb1b AppCoordinator: Update space switch. 2021-07-02 16:50:28 +02:00
SBiOSoftWhare 738fae7b38 SideMenuCoordinator: Hide side menu when selecting a space. 2021-07-02 16:49:02 +02:00
SBiOSoftWhare 0d57c5da78 SplitViewCoordinator: Handle space switch. 2021-07-02 16:48:05 +02:00
SBiOSoftWhare 7f80e73179 TabBarCoordinator: Prepare space switching. 2021-07-02 16:46:53 +02:00
langleyd 1f316be7fa Remove Podfile change 2021-07-02 10:48:12 +01:00
langleyd 28e15a371d Remove Podfile change 2021-07-02 10:42:30 +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