Gil Eluard
|
03de39d9d2
|
Merge branch 'spaces' into gil/4571_explore_rooms
|
2021-08-16 14:00:16 +02:00 |
|
Doug
|
09f68529cd
|
Merge branch 'develop' into doug/4479_media_size_selection
# Conflicts:
# Riot/Managers/Settings/RiotSettings.swift
|
2021-08-16 10:01:54 +01:00 |
|
Gil Eluard
|
caf241f4d6
|
[Spaces] Show suggested in room lists #4501
- Update after code review
|
2021-08-16 10:33:10 +02:00 |
|
Gil Eluard
|
3d0be2ddf7
|
[Spaces] Show suggested in room lists #4501
- Update after code review
|
2021-08-16 07:57:30 +02:00 |
|
Gil Eluard
|
50475d6f2a
|
[Spaces] M10.7 Explore rooms #4571
- UI updates after design changes
|
2021-08-15 22:18:16 +02:00 |
|
David Langley
|
4731efd0f2
|
Do avatar placeholder in SwiftUI, Add AvatarViewModel, Add dependency injection for MxMediaManager dependency.
|
2021-08-15 00:36:15 +01:00 |
|
Stefan Ceriu
|
fa9d3eebb6
|
Fixes #1482 - Popping the user back to the home screen after leaving a room.
|
2021-08-13 17:57:50 +03:00 |
|
Doug
|
8432ad0485
|
Move function.
|
2021-08-13 14:45:22 +01:00 |
|
Doug
|
04c2f31d1e
|
Check for unnecessary assignments to contactsAreFilteredWithSearch in the setter.
|
2021-08-13 14:44:23 +01:00 |
|
Doug
|
24d0b62906
|
Fix the footer when searching from StartChatViewController.
|
2021-08-13 14:38:24 +01:00 |
|
Doug
|
4614b1b47e
|
Load contacts and/or the footer view before the view appears.
|
2021-08-13 14:15:42 +01:00 |
|
David Langley
|
d6424397e7
|
Merge branch 'langleyd/4669_room_notification_settings_swiftui' of github.com:vector-im/element-ios into langleyd/4669_room_notification_settings_swiftui
|
2021-08-13 10:01:11 +01:00 |
|
ismailgulek
|
3d7a4615fc
|
Merge branch 'develop' into element_4471
|
2021-08-13 11:52:12 +03:00 |
|
David Langley
|
c52fd96e0c
|
Update Riot/Modules/Common/Avatar/AvatarService.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
|
2021-08-13 08:24:42 +01:00 |
|
David Langley
|
3ac8b312e0
|
Update Riot/Modules/Common/Avatar/AvatarService.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
|
2021-08-13 08:24:26 +01:00 |
|
David Langley
|
9eae5cfa2c
|
Fix header font size
|
2021-08-12 17:51:50 +01:00 |
|
David Langley
|
8e57222be9
|
Typo
|
2021-08-12 17:10:19 +01:00 |
|
David Langley
|
82b0361647
|
Cleanup from comments
|
2021-08-12 16:57:19 +01:00 |
|
Gil Eluard
|
c310ed2dd5
|
Merge branch 'spaces' into gil/4571_explore_rooms
# Conflicts:
# Riot/Modules/SideMenu/SideMenuCoordinator.swift
|
2021-08-12 17:17:24 +02:00 |
|
David Langley
|
77144980e3
|
Fix avatar service not returning generated image on network error. Fix padding and make nav buttons private.
|
2021-08-12 13:49:56 +01:00 |
|
Gil Eluard
|
326253b2a9
|
Merge branch 'spaces' into gil/4501_show_suggested_in_room_lists
|
2021-08-12 14:35:25 +02:00 |
|
David Langley
|
f0120dd567
|
Remove visibility modifier
|
2021-08-12 12:42:26 +01:00 |
|
Doug
|
a17f29da27
|
Localise contacts disabled alert strings.
|
2021-08-12 12:29:20 +01:00 |
|
Doug
|
801d3fbf5f
|
Fix bug where RequestContactsAccessFooterView could still be visible beneath the contacts.
|
2021-08-12 12:20:08 +01:00 |
|
David Langley
|
90520ecaaa
|
Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/4669_room_notification_settings_swiftui
|
2021-08-12 11:52:50 +01:00 |
|
David Langley
|
9ff69eaaf0
|
Add theming support, and support for other top level configuration to swiftui views with VectorHostingViewController, VectorContentModifier. Add VisibilityModifier. Move from List to VStack.
|
2021-08-12 11:52:06 +01:00 |
|
Gil Eluard
|
58bf6b63ae
|
[Spaces] M10.9 Space menu #4494
- Update after code review
- Fixed some points of design review
|
2021-08-12 11:23:47 +02:00 |
|
Doug
|
9a45b38730
|
Remove directRoomBorderView from InviteRecentTableViewCell.xib.
|
2021-08-12 09:50:18 +01:00 |
|
ismailgulek
|
12a754fbc5
|
Merge branch 'develop' into element_4471
|
2021-08-12 11:08:29 +03:00 |
|
Doug
|
222e22880b
|
Merge branch 'develop' into doug/4484_contacts_access
|
2021-08-11 17:15:23 +01:00 |
|
Doug
|
08188e3ffa
|
Use areAllTermsAgreed instead of hasAccountDataIdentityServerValue. Move identity server terms modal from LegacyAppDelegate into ContactsTableViewController.
|
2021-08-11 17:13:15 +01:00 |
|
Gil Eluard
|
a6328b8f35
|
[Spaces] M10.8 Browsing users in a space #4682
- Added MVVM classes
- roughly integrated `RoomParticipantsViewController` to the MVVM
|
2021-08-10 20:26:27 +02:00 |
|
Doug
|
ebe568bc6c
|
Match StartChatViewController colours to latest Figma.
|
2021-08-10 13:05:11 +01:00 |
|
Doug
|
40a60e98ac
|
Disable the contact access footer view in Unified Search.
|
2021-08-10 12:32:07 +01:00 |
|
Doug
|
70acef24ed
|
Take into account the identity server when setting the default value of showLocalContacts.
|
2021-08-10 12:03:28 +01:00 |
|
Doug
|
c6170e6efa
|
Merge branch 'develop' into doug/4677_fix_contacts_warnings
|
2021-08-10 09:41:57 +01:00 |
|
ismailgulek
|
c76aa7f595
|
Merge remote-tracking branch 'origin/element_4362' into element_4362
|
2021-08-09 18:09:54 +03:00 |
|
ismailgulek
|
0d63496ec6
|
Merge branch 'develop' into element_4362
|
2021-08-09 18:09:45 +03:00 |
|
ismailgulek
|
6aae1c0408
|
Update Riot/Modules/Authentication/SSO/SSOURLConstants.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
|
2021-08-09 18:06:08 +03:00 |
|
Gil Eluard
|
16d951072b
|
[Spaces] M10.7 Explore rooms #4571
- Added suggested tag to the explore rooms cell
- Implemented join feature
|
2021-08-09 17:05:36 +02:00 |
|
Doug
|
1ae2559e25
|
Add missing Weakify/Strongify.
|
2021-08-09 15:59:46 +01:00 |
|
Doug
|
5ec7f4cd61
|
Fix warnings: Block implicitly retains 'self'
|
2021-08-09 15:45:59 +01:00 |
|
Doug
|
652a0e29fb
|
Hide local contacts in Unified Search.
|
2021-08-09 15:08:05 +01:00 |
|
Doug
|
0f87da3d53
|
Replace hasLocalContacts with showLocalContacts.
Update the value of showLocalContacts in ContactsTableViewController.
|
2021-08-09 12:58:18 +01:00 |
|
Doug
|
aa2f8d4d96
|
Fix image name.
|
2021-08-09 12:22:56 +01:00 |
|
Gil Eluard
|
be867d0598
|
[Spaces] M10.7 Explore rooms #4571
- Added an room detail screen
|
2021-08-06 15:51:51 +02:00 |
|
ismailgulek
|
90fff2696f
|
Merge branch 'develop' into ismail/4642_additions
|
2021-08-06 16:22:38 +03:00 |
|
ismailgulek
|
f85d8c6db2
|
Use new strings for ended calls
|
2021-08-06 16:20:10 +03:00 |
|
David Langley
|
9570a9422b
|
Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/4669_room_notification_settings_swiftui
|
2021-08-06 13:52:55 +01:00 |
|
Doug
|
dc2c09fc9e
|
Merge branch 'develop' into doug/4520_remove_dm_avatar_border
|
2021-08-06 12:26:18 +01:00 |
|