97c310c353
Merge branch 'develop' into gil/4570_home_space_data_filtering
2021-10-15 14:20:04 +02:00
71667de9b1
#1098 - Working real user suggestion inside the main application.
2021-10-13 11:26:22 +03:00
8c9c69586f
Merge remote-tracking branch 'origin/develop' into doug/4484_contacts_access
...
# Conflicts:
# Riot/Modules/ServiceTerms/Modal/ServiceTermsModalCoordinatorBridgePresenter.swift
2021-10-08 11:45:43 +01:00
8fc3632863
[Spaces] M10.4.1 Home space data filtering #4570
...
- Added settings menu for Home space
2021-10-07 15:37:20 +02:00
acc7ee31ca
Add final strings. Tweak header.
2021-10-06 17:36:28 +01:00
83a0754916
Small tweaks plus changelog entry.
...
Use the new generated localisation strings. Add comments.
Address feedback from PR review.
2021-10-01 16:16:26 +01:00
0500f703b2
i18n: Standardise casing of identity server and integration manager.
2021-10-01 11:51:30 +01:00
1c4b09b813
Merge branch 'develop' into doug/4484_contacts_access
...
# Conflicts:
# Riot/Assets/en.lproj/Vector.strings
# Riot/Generated/Strings.swift
# Riot/Modules/Application/LegacyAppDelegate.m
# Riot/Modules/Settings/SettingsViewController.m
2021-09-30 11:14:02 +01:00
d0c989d72e
Add an image for the integration manager to ServiceTermsModalScreenViewController.
2021-09-29 17:40:37 +01:00
8fd88b2053
[Spaces] M10.6.1 Handle space link #4498
...
- Update after code review
2021-09-23 17:15:32 +02:00
bfe5835082
Merge branch 'develop' into spaces
2021-09-23 15:26:06 +02:00
49f815ce9d
[spaces] several fixes for pre release
...
- [When switching spaces, user and room tabs are not populated](https://github.com/vector-im/element-ios/issues/4889 )
- [Explore rooms list in space has odd ordering](https://github.com/vector-im/element-ios/issues/4890 )
- Fixed Coming Soon error for Explore rooms
2021-09-22 16:57:31 +02:00
e6327eb955
Merge branch 'develop' into stefan/4881-configurable-app-name-localization-strings
...
# Conflicts:
# Riot/Generated/Strings.swift
2021-09-22 17:17:05 +03:00
9957f8f59a
Fixes #4881 - Replaced InfoPlist.cfBundleDisplayName with AppInfo.current.displayName and removed the now unused InfoPlist generated class.
2021-09-22 16:59:47 +03:00
7b1ab21b76
Merge branch 'spaces' into gil/pre_release_fixes
2021-09-22 15:39:55 +02:00
3c0a4c0633
Merge branch 'develop' into spaces
...
# Conflicts:
# Riot/Assets/en.lproj/Vector.strings
2021-09-22 15:39:06 +02:00
4dd70594cc
Fixes #4881 - Using the bundle display name as the app name in localizable .strings files. Exposing generated .strings and info.plist members to Objective-C.
2021-09-22 14:10:16 +03:00
02acac05c8
Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/4781_swiftui_template_examples
2021-09-22 11:39:42 +01:00
b7b2fff7e3
Fix #4415 - Added back section header when only PIN available.
2021-09-22 08:44:48 +03:00
5864f2a55f
Merge branch 'spaces' into gil/pre_release_fixes
2021-09-20 10:18:59 +02:00
ca83d8258f
Merge branch 'develop' into spaces
2021-09-20 10:18:01 +02:00
d879928a96
[spaces] several fixes for pre release
...
- [Space home view inherits title from previously viewed tab](https://github.com/vector-im/element-ios/issues/4851 )
- [Home view doesn't refresh when new rooms are created](https://github.com/vector-im/element-ios/issues/4849 )
- [Odd error message in Space member list](https://github.com/vector-im/element-ios/issues/4845 )
- [Bring leaving space experience in line with Web](https://github.com/vector-im/element-ios/issues/4850 )
- [No notification for space invitation](https://github.com/vector-im/element-ios/issues/4840 )
- [Remove filter when space is switched](https://github.com/vector-im/element-ios/issues/4852 )
- [M10.11 Remove community tab](https://github.com/vector-im/element-ios/issues/4493 )
2021-09-20 10:10:27 +02:00
a94969403c
Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/4781_swiftui_template_examples
2021-09-20 08:50:38 +01:00
311d19c952
Update setting string.
2021-09-16 17:57:36 +01:00
6a92f89feb
Enable URL Previews by default and remove from Labs.
2021-09-16 17:51:56 +01:00
d189c4d618
Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/4781_swiftui_template_examples
2021-09-15 14:33:05 +01:00
9279d17226
Merge branch 'develop' into spaces
...
# Conflicts:
# Riot/Modules/Common/Avatar/AvatarViewDataProtocol.swift
# Riot/Modules/Common/Recents/RecentsViewController.m
# Riot/Modules/Home/Views/RoomCollectionViewCell.m
# Riot/Modules/TabBar/TabBarCoordinator.swift
2021-09-15 14:42:04 +02:00
4c2bd8ee76
Add ServiceTermsModalTableHeaderView to ServiceTermsModalScreenViewController.
2021-09-15 11:53:30 +01:00
8ea77dd2cf
Rename RequestContactsAccessFooterView to FindYourContactsFooterView.
2021-09-15 10:03:32 +01:00
11fa6a9f7b
Fix rotation layout bug. Update button title.
2021-09-14 17:22:28 +01:00
bc0c7f36aa
[Spaces] M10.6 Space preview bottom sheet #4497
...
- Update after design review
2021-09-14 09:42:10 +02:00
806c6d3677
Show an activity indicator whilst preparing the identity service. Show an alert when there's an error.
2021-09-13 14:25:54 +01:00
c1ad2e9ece
Update the Service Terms modal from the latest Figma.
...
Checkboxes have been removed from the individual policies.
Reverse flow so that the service terms are show before the contacts access popup.
Removes outOfContext from the modal as it will only be presented when requested.
Fixes second presentation on swipe to dismiss of the modal.
2021-09-13 11:46:31 +01:00
29400b7b19
Update strings in SettingsViewController.
2021-09-09 15:17:29 +01:00
1f9abbcd10
Revert search bar placeholder.
2021-09-09 14:41:03 +01:00
3bcec8afb6
Update strings and add localise. Use theme v2.
2021-09-09 13:08:50 +01:00
546c1e10ca
Merge branch 'develop' into doug/4484_contacts_access
2021-09-09 12:24:08 +01:00
bb98bbe1c0
Merge branch 'develop' into doug/888_add_url_previews
2021-09-07 17:51:31 +01:00
a05b1cab03
Move url preview setting under labs section.
2021-09-07 16:00:12 +01:00
d82ae75a0b
Add Simple Template Example
...
- Add a simple Template example that shows a user profile with avatar, displayName and presence.
- ScreenCoordinator: closure based with less protocols and delegates.
- Reducer: Reducer function that manages all state modifications.
- SwiftUI View: Decomposes UI into appropriate sub components.
- Uses Theme and Dependency Management Infrastructure
2021-09-06 17:12:31 +01:00
640c4a562c
Merge branch 'develop' into doug/4479_media_size_selection
...
# Conflicts:
# Riot/Managers/Settings/RiotSettings.swift
2021-09-06 17:04:22 +01:00
122b414433
[Spaces] M10.6 Space preview bottom sheet #4497
...
- Localized strings for space join rule
2021-09-06 08:47:43 +03:00
fd5d96aff9
[Spaces] M10.6 Space preview bottom sheet #4497
2021-09-06 07:46:43 +03:00
24bfe36712
Add setting to disable URL previews.
...
Using a temporary position in the settings screen whilst waiting for feedback.
2021-09-03 10:19:26 +01:00
0ea0380da7
Merge remote-tracking branch 'origin/develop' into doug/888_add_url_previews
2021-09-02 17:39:42 +01:00
a3b4bab284
[Spaces] M10.8 Browsing users in a space #4682
...
- Update after design review
2021-09-02 10:17:09 +03:00
3decd0200d
Merge branch 'gil/4571_explore_rooms' into gil/4682_browsing_users_in_a_space
...
# Conflicts:
# Riot/Modules/SideMenu/SideMenuCoordinator.swift
2021-09-02 07:51:55 +03:00
8a2ba8bf44
[Spaces] M10.7 Explore rooms #4571
...
- Update after review
2021-09-01 18:12:08 +03:00
ada377dcf2
Finish extraction
...
- Moves SwiftUI code out of Riot and into RiotSwiftUI which has no dependency on Matrix SDK.
- Git wasn't smart enough to see the file moves. Most feature function has remain unchanged. 1 change I did make was remove NotificationSettingsViewModel's dependence on MxPushRule, so that the view model could be moved into RiotSwiftUI.
- Add LocaleProvider to abstract VectorL10n's use of Matrix SDK language so it can be used in RiotSwiftUI.
- Split Theme into UKit/SwiftUI version to remove RiotSwiftUI's dependence on ThemeService and ThemeV1.
- Migrated from ThemeObserver to ThemePublisher. We push updates to ThemePublisher so that we can remove ThemeService as dependency.
- Add .DS_Store to .gitignore
2021-09-01 12:34:38 +01:00
4331994d72
Load and store URLPreviewViewData in RoomBubbleCellData.
...
Implement close button and store the action in Core Data. Hide the preview image view when no image is received. Remove line breaks in description text.
2021-09-01 10:37:37 +01:00
Gil Eluard
Stefan Ceriu
Doug
manuroe
David Langley