Commit Graph

2395 Commits

Author SHA1 Message Date
ismailgulek a3ec1b747e Merge branch 'develop' into element_4471 2021-07-07 12:26:43 +03:00
Gil Eluard 113fd85103 #4090 - Update after review 2021-07-06 23:03:56 +02:00
langleyd 687d5e403d Use theme font types 2021-07-06 21:10:42 +01:00
langleyd d2a0a35e7c Merge branch 'develop' of github.com:vector-im/element-ios into roomNotificationSettings 2021-07-06 19:51:17 +01:00
langleyd 152d87768a Fix typos, naming and copywright 2021-07-06 19:39:15 +01:00
Doug d69c00484b Merge branch 'develop' into doug/4515_fix_video_thumbnail_orientation 2021-07-06 17:47:47 +01:00
Doug b9b63ff03e Tidy up PeopleViewController data source methods. 2021-07-06 17:43:16 +01:00
Doug b5526e4496 Remove check. 2021-07-06 16:37:11 +01:00
Doug 0c5bbbe474 Begin removing contacts section from PeopleViewController. 2021-07-06 16:14:32 +01:00
David Baker 8744af255d Merge remote-tracking branch 'origin/develop' into dbkr/scan_button_title 2021-07-06 15:36:14 +01:00
Gil Eluard bc3de17825 Update Riot/Modules/Room/RoomViewController.m
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
2021-07-06 15:17:22 +02:00
langleyd 6a8c64ea5a 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 74d4356c89 Fix build, mute bug and footer label on unencrypted builds 2021-07-06 11:38:29 +01:00
Doug e74e292fcd Generate video thumbnails with the correct orientation. 2021-07-06 10:41:47 +01:00
Gil Eluard 3c010f117c Merge branch 'develop' into element_4090
# Conflicts:
#	CHANGES.rst
2021-07-06 09:27:28 +02:00
Gil Eluard b24879ac66 MXKeyBackup: trustForKeyBackupVersionFromCryptoQueue must consider MSK trust
- code tweaks and optimizations
2021-07-06 08:57:51 +02:00
Doug 07ec3d2f52 Fix crash when running on macOS with Apple Silicon. 2021-07-05 19:19:51 +01:00
langleyd dd3cab44e2 spacing and cleanup dead code 2021-07-05 16:49:06 +01:00
langleyd 5889742845 Fix build and naming of State -> ViewData 2021-07-05 16:28:14 +01:00
Doug d6c0be5a6b Show encrypted message notification content by default. 2021-07-05 15:27:52 +01:00
langleyd acb88ffa12 Fix service naming 2021-07-04 17:27:19 +01:00
langleyd 213bfc817d Change in behaviour: mute should actually mean mute on update now. 2021-07-04 17:06:19 +01:00
langleyd 8c515d8fd4 Add ViewModel tests and change avatar data to use existing AvatarViewDataProtocol 2021-07-04 17:01:42 +01:00
langleyd 34891e4853 Add avatar view and title 2021-07-04 10:46:17 +01:00
langleyd 6a48bacd36 Add entry points at long press on home view and slide on recents. 2021-07-02 20:19:46 +01:00
David Baker 0ae203936e 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 41c51f0f50 Fix SwiftLint warnings. 2021-07-02 17:13:45 +01:00
Doug 6575447f51 Fix documentation warnings. 2021-07-02 16:46:27 +01:00
langleyd 45cfcf3cc3 Update theming and footer 2021-07-02 16:16:54 +01:00
langleyd ffa6b73945 Fix naming of Repository -> Service, Impl -> Type 2021-07-02 10:39:27 +01:00
langleyd 7392bdbe83 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 c60093a4ee Add translations, footer message and room encryption handling 2021-07-02 10:15:35 +01:00
Gil Eluard e0aafe4402 #4090 - Improved performances 2021-07-02 07:38:56 +02:00
ismailgulek 2e21340b13 Adapt Swifty session states 2021-06-30 18:02:11 +03:00
Doug adea4257bd Merge remote-tracking branch 'origin/develop' into element_4485
# Conflicts:
#	CHANGES.rst
2021-06-30 12:43:37 +01:00
Doug 356f6ba6a4 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
ismailgulek 31ec4e731d 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 12dc7d0b66 Merge branch 'develop' into element_4090 2021-06-30 09:22:18 +02:00
Gil Eluard ba05555bf2 #4090 - fixed small theme issues 2021-06-29 17:05:01 +02:00
Gil Eluard 471435fccf #4090 - bug fixing and removed work queue 2021-06-29 15:08:55 +02:00
ismailgulek 2ba0f1f947 Adapt renaming 2021-06-29 15:10:16 +03:00
Doug 5c11b32d77 Merge remote-tracking branch 'origin/develop' into element_4485 2021-06-29 10:32:19 +01:00
Doug 9762cddca2 Ensure authenticationActivityIndicator is in front of the input fields. 2021-06-29 09:45:07 +01:00
Gil Eluard bb3312c423 #4090 - Hide voice message button when on action mode 2021-06-29 10:36:10 +02:00
Gil Eluard a9349d86f4 #4090 - Fixed UI regression if BuildSettings.voiceMessagesEnabled = false 2021-06-29 10:17:15 +02:00
Gil Eluard 4cf6646931 #4090 - Use a dedicated dispatch queue for process 2021-06-29 08:52:21 +02:00
Doug 6c95425578 Use secondary colour from the theme for authenticationActivityIndicator.
This allows the indicator to be seen when using a dark theme.
2021-06-28 16:38:54 +01:00
SBiOSoftWhare a82bf17c3f SSOAuthenticationService: Handle login callback URL with HTML entities. 2021-06-28 16:49:05 +02:00
SBiOSoftWhare d01ca09928 AuthenticationVC: Show an error alert on SSO authentication failure. 2021-06-28 16:45:20 +02:00
ismailgulek a5817fa1bb Use new fonts 2021-06-28 15:33:44 +03:00