Commit Graph

2205 Commits

Author SHA1 Message Date
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
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 7063978364 Fix documentation. 2021-07-08 12:28:52 +01:00
Doug 105b1c5bd7 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 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
David Baker 8744af255d Merge remote-tracking branch 'origin/develop' into dbkr/scan_button_title 2021-07-06 15:36:14 +01: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
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
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
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
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
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
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
ismailgulek 9038f3c5aa Merge branch 'develop' into voip_audio_router_menu 2021-06-28 15:22:52 +03:00
ismailgulek cfaf006a77 Fix horizontal spacing 2021-06-28 15:22:03 +03:00
ismailgulek e61603aff0 Fix background color of menu 2021-06-28 13:30:36 +03:00
ismailgulek 4757a50f49 Implement router methods 2021-06-28 02:22:25 +03:00
ismailgulek 0f9722b52f Audio route menu and item views 2021-06-28 02:21:40 +03:00
ismailgulek fc1944112e Update UI for new more button 2021-06-28 02:20:59 +03:00
ismailgulek 124117f25c Refactor sliding modal, combine options when passing 2021-06-28 02:13:49 +03:00
langleyd 7453fa68bb Add NotificationRepository, ViewModel and ViewController 2021-06-25 22:38:31 +01:00
SBiOSoftWhare 67f9cd7071 Merge pull request #4455 from vector-im/design_kit_fonts
DesignKit: Handle text styles
2021-06-24 16:35:40 +02:00
SBiOSoftWhare 187d7c541e SideMenu: Use right font for the display name. 2021-06-24 15:50:06 +02:00
Stefan Ceriu 3741cab639 Fix retain cycle between the RoomTitleView (strong tapGestureDelegate) and the RoomViewController. 2021-06-24 09:50:32 +03:00
langleyd c554e48ad2 Add correct asset for notifications icon. 2021-06-22 16:01:21 +01:00
langleyd 6f74b79f1b Add new settings notification feature flag and update ui entry point 2021-06-22 13:39:50 +01:00