Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-30 00:02:47 +00:00
Code Issues Projects Releases Packages Wiki Activity
12735 commits 46 branches 261 tags 144 MiB
Commit graph

593 commits

Author SHA1 Message Date
Doug
bf52311bda 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
Doug
f130bb36f9 Add final strings. Tweak header. 2021-10-06 17:36:28 +01:00
Doug
50d9952c08 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
manuroe
e60f92eaf8 i18n: Standardise casing of identity server and integration manager. 2021-10-01 11:51:30 +01:00
Doug
b9dc5d6eca 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
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
Doug
8705191ab1 Add ServiceTermsModalTableHeaderView to ServiceTermsModalScreenViewController. 2021-09-15 11:53:30 +01:00
Doug
3198f7cf0e Rename RequestContactsAccessFooterView to FindYourContactsFooterView. 2021-09-15 10:03:32 +01:00
Doug
e5702c6104 Fix rotation layout bug. Update button title. 2021-09-14 17:22:28 +01: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
684b1fb3ed 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
Doug
2c0fdf7919 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
Doug
fb192538d2 Update strings in SettingsViewController. 2021-09-09 15:17:29 +01:00
Doug
7fc8d1c0cc Revert search bar placeholder. 2021-09-09 14:41:03 +01:00
Doug
b71649e6ca Update strings and add localise. Use theme v2. 2021-09-09 13:08:50 +01:00
Doug
94b996fb12 Merge branch 'develop' into doug/4484_contacts_access 2021-09-09 12:24:08 +01: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
Paulo Pinto
eafcd7d2cb Standardise casing of terms in source strings 
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-08-18 17:30:45 +01: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