Commit graph

573 commits

Author SHA1 Message Date
Gil Eluard
cf51612864 Merge branch 'develop' into spaces 2021-09-23 15:26:06 +02:00
Gil Eluard
e6b72a778a [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
Stefan Ceriu
6111382a63 Merge branch 'develop' into stefan/4881-configurable-app-name-localization-strings
# Conflicts:
#	Riot/Generated/Strings.swift
2021-09-22 17:17:05 +03:00
Gil Eluard
4782ba89ed Merge branch 'spaces' into gil/pre_release_fixes 2021-09-22 15:39:55 +02:00
Gil Eluard
f6ea4da656 Merge branch 'develop' into spaces
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
2021-09-22 15:39:06 +02:00
Stefan Ceriu
0848f66cdb 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
David Langley
310028bd39 Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/4781_swiftui_template_examples 2021-09-22 11:39:42 +01:00
Stefan Ceriu
6abdcb9e93 Fix #4415 - Added back section header when only PIN available. 2021-09-22 08:44:48 +03:00
Gil Eluard
8e4b98fef0 Merge branch 'spaces' into gil/pre_release_fixes 2021-09-20 10:18:59 +02:00
Gil Eluard
84bdf88fe1 Merge branch 'develop' into spaces 2021-09-20 10:18:01 +02:00
Gil Eluard
c1a542ef49 [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
David Langley
98078b3466 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
Doug
84bdfb31c7 Update setting string. 2021-09-16 17:57:36 +01:00
Doug
96ef61ab21 Enable URL Previews by default and remove from Labs. 2021-09-16 17:51:56 +01:00
David Langley
fb0f023964 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
Gil Eluard
8ba6c55a87 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
Gil Eluard
753e1e5918 [Spaces] M10.6 Space preview bottom sheet #4497
- Update after design review
2021-09-14 09:42:10 +02:00
Doug
1c7cef52a0 Merge branch 'develop' into doug/888_add_url_previews 2021-09-07 17:51:31 +01:00
Doug
0094add5a4 Move url preview setting under labs section. 2021-09-07 16:00:12 +01:00
David Langley
2b2275d0d7 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
Gil Eluard
51abfdc3d9 [Spaces] M10.6 Space preview bottom sheet #4497
- Localized strings for space join rule
2021-09-06 08:47:43 +03:00
Doug
2e04123337 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
Gil Eluard
e46f5faec3 [Spaces] M10.8 Browsing users in a space #4682
- Update after design review
2021-09-02 10:17:09 +03:00
Doug
04c63d4e33 Merge branch 'develop' into doug/4479_media_size_selection
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
2021-08-27 16:30:01 +01:00
Doug
99d66f0c0a Merge branch 'develop' into doug/4479_media_size_selection 2021-08-27 16:28:15 +01:00
Doug
4a1a58d804 Update media settings strings. Update share extension image size prompt. 2021-08-27 16:15:46 +01:00
David Langley
45540f1d4f
Merge pull request #4752 from vector-im/langleyd/4467_account_notification_settings
Account Notification Settings and Keywords
2021-08-26 11:07:11 +01:00
David Langley
39547b414a Remove unneeded string from bad merge 2021-08-25 14:25:57 +01:00
David Langley
b87d879c22 Add Chips, InputStyles, Service Implementation, swift-collections and UI cleanup. 2021-08-25 13:03:36 +01:00
Stefan Ceriu
4322f7dcf5 Implements #4693 - Alert users of Element on iOS11 deprecation. 2021-08-25 13:57:32 +03:00
Doug
b61135ffb7 Merge branch 'develop' into doug/4479_media_size_selection 2021-08-23 12:49:06 +01:00
Doug
fc75307c54 Combine confirm image/video size settings into one. 2021-08-23 11:16:32 +01:00
Gil Eluard
91d9169da6 [Spaces] M10.8 Browsing users in a space #4682
- Added navigation to member detail page
2021-08-22 08:48:54 +03:00
Doug
24ff73b413 Update from feedback.
Set notificationBodyLocalizationKey in CommonConfiguration. Remove redundant customisation. Use MXRoomMemberEventContent.
2021-08-18 12:32:32 +01:00
David Langley
29b436f9a8 Add NotificationSettings and Keywords UI and VM 2021-08-18 09:33:56 +01:00
Doug
8a6fd69505 Add reaction content to notifications when available. 2021-08-17 15:51:18 +01:00
Doug
8773d77b5d Update strings from feedback. 2021-08-17 15:38:01 +01:00
David Langley
48d69ba041 run template, add entrypoint and update BuildSetting 2021-08-17 15:00:20 +01:00
Doug
9031412c02 Add an (optional) prompt when sending a video to select its size.
Use high quality when filming video in-app.
2021-08-16 17:48:26 +01:00
Gil Eluard
3b1c0119b7 [Spaces] M10.7 Explore rooms #4571
- Update after design review
2021-08-16 15:44:44 +02:00
Gil Eluard
f62504b8fa Merge branch 'spaces' into gil/4571_explore_rooms 2021-08-16 14:00:16 +02:00
Doug
b7245935a1 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
a968bab33c [Spaces] M10.7 Explore rooms #4571
- UI updates after design changes
2021-08-15 22:18:16 +02:00
Doug
5e8da21cff Merge branch 'develop' into doug/4132_improve_notification_content 2021-08-11 17:18:09 +01:00
Doug
538429eca1 Merge branch 'develop' into doug/4132_improve_notification_content 2021-08-10 10:28:40 +01:00
Thomas Weiland
4d21e36d9c
fixed typo "adress" issue #4480 2021-08-10 10:20:35 +02:00
Gil Eluard
1cb9a6b691 [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
Gil Eluard
53b751a707 [Spaces] M10.7 Explore rooms #4571
- Added an room detail screen
2021-08-06 15:51:51 +02:00
ismailgulek
001d1ec120
New strings 2021-08-06 16:19:53 +03:00
Stefan Ceriu
5551bac29f #4655 - Localized lock screen voice message name placeholder. 2021-08-05 16:55:02 +03:00