Commit graph

651 commits

Author SHA1 Message Date
Andy Uhnak
92b31a0f01 Join room loading indicators 2022-03-29 15:03:09 +01:00
David Langley
0f89eb014e
Merge pull request #5743 from vector-im/langleyd/5017_uisi_autoreporter
App: UISI AutoReporting
2022-03-24 14:58:23 +00:00
MaximeEvrard42
5a4c5e55ee
Merge pull request #5859 from vector-im/maximee/5720_location_sharing_UI_change
Update UI in location sharing view #5720
2022-03-24 11:58:09 +01:00
aringenbach
d414fb1ad7 Improve error display for Jitsi service unable to start 2022-03-22 14:03:30 +01:00
MaximeE
49144e1e0e 5720: Update from develop 2022-03-22 09:41:25 +01:00
Doug
b870c5aac4 Fix missing } from rebase. 2022-03-21 17:58:39 +00:00
Doug
bf08b86a36 Address PR comments
Add more docs.
Rename PhotoPickerPresenter to MediaPickerPresenter.
Use a Character for the placeholder avatar rather than a string.
2022-03-21 17:37:16 +00:00
Doug
57d396887b Use UserIndicatorPresenter for onboarding personalisation.
Remove the service from the display name screen to match the avatar screen.
Add a loading indicator to PhotoPickerPresenter.
Fix layout issue when selecting non-square avatar image.
2022-03-21 17:37:16 +00:00
ismailgulek
8150424a25
Add strings 2022-03-18 12:57:47 +03:00
MaximeE
83a718b38d 5720: Update UI in location sharing View 2022-03-17 16:52:22 +01:00
SBiOSoftWhare
c92d1c4fd1 Add live location banner strings. 2022-03-17 16:37:32 +01:00
David Langley
4e1e9afa59 Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/5017_uisi_autoreporter 2022-03-16 21:45:33 +00:00
David Langley
5c39eb2f51 Update detector to match web implementation(only track decryption attempts), add labs flag, increase rate limit spacing. 2022-03-16 17:47:41 +00:00
Andy Uhnak
9a4c3e485b Merge branch 'master' into develop 2022-03-14 16:26:07 +00:00
Andy Uhnak
31ec9be2ad Ignore the sender of a room invite without needing to join the room first 2022-03-11 16:24:40 +00:00
Gil Eluard
996ef72498 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/Room/Settings/RoomSettingsViewController.h
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
2022-03-08 11:23:55 +01:00
Arnaud Ringenbach
059b75a957 Rename profile as userAvatarAndName 2022-03-07 13:45:02 +01:00
Arnaud Ringenbach
724eef1b83 Use only latest profiles in the timeline (labs) 2022-03-07 13:45:02 +01:00
Gil Eluard
aadf1b7d67 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Config/BuildSettings.swift
#	Riot/Generated/Strings.swift
#	Riot/Modules/Home/HomeViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
2022-03-04 13:38:18 +01:00
Gil Eluard
cd742d972a Merge branch 'gil/SP1_space_creation' of github.com:vector-im/element-ios into gil/SP1_space_creation 2022-03-04 13:06:27 +01:00
Gil Eluard
1fcf96865c
SP4: space settings (#5730)
* SP4: Space Settings

- Space settings screen implemented
- No space upgrade available as per Element web
- Need more insights for the space address field
- Added settings live update
- Added local alias implementation
2022-03-04 12:53:42 +01:00
Andy Uhnak
3ec1e80c9d Track failed creation of attributed strings 2022-03-03 12:45:50 +00:00
Doug
705b31a302 Remove MatrixKitL10n from SwiftGen
Uses VectorL10n everywhere.
2022-03-03 09:34:54 +00:00
Gil Eluard
89a16a72c2 Merge branch 'develop' into gil/SP1_space_creation 2022-03-01 10:15:13 +01:00
Gil Eluard
d8c9d933e8 Merge branch 'gil/5231_SP3-1_Update_room_settings_for_Spaces' into gil/5232_SP3-2_Long_press_on_rooms_in_space_room_lists
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
2022-02-25 14:31:22 +01:00
Anderas
c7985e5a1a
Merge pull request #5630 from vector-im/andy/5605_leave_room
Update activity indicators on leaving room
2022-02-25 09:52:03 +00:00
Gil Eluard
8bd67bdc52 Merge branch 'gil/SP1_space_creation' into gil/5231_SP3-1_Update_room_settings_for_Spaces
# Conflicts:
#	Podfile.lock
2022-02-21 17:57:58 +01:00
Gil Eluard
8fa0a673d6 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Riot/Modules/People/PeopleViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift
2022-02-21 17:20:58 +01:00
Gil Eluard
df25a2ce2f Merge branch 'gil/SP1_space_creation' into gil/5231_SP3-1_Update_room_settings_for_Spaces
# Conflicts:
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoomCoordinator.swift
#	RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooser.swift
2022-02-21 15:27:05 +01:00
Andy Uhnak
bf39fbf8de Update activity indicators on leaving room
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-18 13:31:21 +00:00
Stefan Ceriu
26c98bbabe vector-im/element-ios/issues/5609 - Add open in OSM location sharing option. 2022-02-17 19:11:08 +02:00
Gil Eluard
f4e6b867a2 SP2: Adding Rooms to Spaces #523o
- fixed SwiftUI Unit tests
2022-02-17 13:14:45 +01:00
aringenbach
c57693255f
Update filter placeholder and icon (#5520)
* Update filter placeholder and icon

* Use SwiftGen asset helper & add filter_on icon

Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-14 10:25:21 +01:00
MaximeE
21838e54e6 Replace kick by remove in all strings 2022-02-11 14:25:20 +01:00
Doug
3943b17d57
Merge pull request #5467 from vector-im/doug/5160_ftue_use_case
Add the FTUE use case screen for new users.
2022-02-10 14:28:28 +00:00
Doug
07b3bf7860 Add some missing SwiftGen updates to strings. 2022-02-09 15:01:57 +00:00
Gil Eluard
f462a6e3d0 Merge branch 'gil/5231_SP3-1_Update_room_settings_for_Spaces' into gil/5232_SP3-2_Long_press_on_rooms_in_space_room_lists
# Conflicts:
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewModel.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoomCoordinator.swift
2022-02-06 21:22:28 +01:00
Gil Eluard
96cf359703 Merge branch gil/5230_SP2-Adding_Rooms_to_Spaces into gil/5231_SP3-1_Update_room_settings_for_Spaces 2022-02-05 21:43:29 +01:00
Gil Eluard
97e22f50aa SP2: Adding Rooms to Spaces #523o
- check permission before adding room
- Added join button in explore room screens
2022-02-05 08:20:39 +01:00
Doug
906eb48181 Tweaks to the Use Case screen ready for review.
Update strings.
Show the custom server field as needed.
Enable scroll edges appearance for white navigation bar.
2022-02-04 16:10:38 +00:00
Doug
d11b3e0950 Add the Use Case selection screen to the onboarding flow. 2022-02-04 16:10:38 +00:00
Gil Eluard
601ba0b472 Merge branch gil/SP1_space_creation into gil/5230_SP2-Adding_Rooms_to_Spaces 2022-02-04 16:43:43 +01:00
Gil Eluard
f9a1fdfe85 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Riot/Modules/Room/RoomCoordinatorBridgePresenter.swift
#	Riot/Modules/Room/RoomCoordinatorParameters.swift
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
2022-02-04 14:29:57 +01:00
Doug
43fb085521 Update strings, fix missing symbol. 2022-02-03 18:30:39 +00:00
Stefan Ceriu
7c54bf763c Made StateStoreViewModel state mutable and removed the reducer for all the features using it. 2022-02-02 10:02:12 +02:00
Gil Eluard
8fecbaf722 Merge branch 'gil/SP1_space_creation' into gil/5225_invite_to_space_in_room_landing
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Images.swift
#	Riot/Generated/Strings.swift
2022-01-26 10:55:05 +01:00
Gil Eluard
e18c7e0744 SP1.2: Invite to Space in room landing element-ios#5225
- Check user permissions to invite people
2022-01-26 10:17:42 +01:00
Gil Eluard
afa77deef7 Merge branch 'gil/SP1_space_creation' into gil/5225_invite_to_space_in_room_landing
# Conflicts:
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
#	Riot/SupportingFiles/Riot-Bridging-Header.h
2022-01-24 19:36:02 +01:00
Gil Eluard
b2bf867a84 Merge branch 'gil/SP1_space_creation' into gil/143_create_public_space
# Conflicts:
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
2022-01-24 09:30:05 +01:00
ismailgulek
8a1d66f49a
Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-19 00:09:26 +03:00
ismailgulek
fe9eeeadd5
Merge branch 'develop' into ismail/5068_start_thread 2022-01-19 00:07:52 +03:00
Stefan Ceriu
2dfbe69a88 vector-im/element-ios/issues/5114 - Added UI for creating undisclosed polls and logic for displaying them in the timeline. 2022-01-18 20:05:10 +02:00
Stefan Ceriu
a23bd0da99 vector-im/element-ios/issues/5114 - Allow editing poll start events. 2022-01-18 20:05:10 +02:00
ismailgulek
cb57694d32
Add thread decoration views for search results, fix #5268 2022-01-18 14:46:22 +03:00
Gil Eluard
03f68b5b69 Merge branch 'gil/5231_SP3-1_Update_room_settings_for_Spaces' into gil/5232_SP3-2_Long_press_on_rooms_in_space_room_lists 2022-01-18 10:11:16 +01:00
Gil Eluard
a18884fd26 Merge branch 'gil/5230_SP2-Adding_Rooms_to_Spaces' into gil/5231_SP3-1_Update_room_settings_for_Spaces 2022-01-17 20:40:33 +01:00
Gil Eluard
4c4f668e57 Merge branch 'develop' into gil/5230_SP2-Adding_Rooms_to_Spaces
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
#	Riot/SupportingFiles/Riot-Bridging-Header.h
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
2022-01-17 20:40:12 +01:00
Gil Eluard
2c5ed41f02 SP3.2: Long press on rooms in space room lists #5232
- Added context menu for spaces and rooms in Explore rooms screen
2022-01-17 16:44:40 +01:00
ismailgulek
e9b24263e7
Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-17 11:37:41 +03:00
ismailgulek
aeccbc0dac
Merge branch 'develop' into ismail/5068_start_thread 2022-01-17 11:35:10 +03:00
Doug
d93d6cd9f5 Add onboarding splash screen strings for Weblate. 2022-01-14 15:05:54 +00:00
Gil Eluard
be4cd455f1 Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
2022-01-13 16:30:55 +01:00
Gil Eluard
cdb4cc131e SP3.1: Update room settings for Spaces element-ios#5231
- Changed the Room Settings screen according to the new design
- Implemented the room access flow
- Added room upgrade support
- Implemented the room suggestion screen
2022-01-13 15:53:45 +01:00
SBiOSoftWhare
565b1cca05
Merge pull request #5342 from vector-im/steve/5321_bubbles_lauching
Message bubbles: Add settings and build flag
2022-01-13 09:50:23 +01:00
ismailgulek
52d780ec46
Update strings 2022-01-11 15:23:22 +03:00
Gil Eluard
bce0bf3d4a Merge branch 'gil/SP1_space_creation' into gil/143_create_public_space
# Conflicts:
#	Riot/Generated/Strings.swift
#	Riot/Assets/en.lproj/Vector.strings
2022-01-10 09:50:00 +01:00
ismailgulek
fc140880b0
Toast resources 2022-01-06 02:39:46 +03:00
Stefan Ceriu
eead770633 vector-im/element-ios/issues/5298 - Various tweaks following code review. 2022-01-04 17:33:32 +02:00
Stefan Ceriu
28cb2d23d1 vector-im/element-ios/issues/5298 - Settings screen toggle for disabling location sharing. 2022-01-04 17:33:32 +02:00
Stefan Ceriu
a27dd1a230 vector-im/element-ios/issues/5298 - Allow sharing locations to other system apps. 2022-01-04 17:33:32 +02:00
Stefan Ceriu
352d56726e vector-im/element-ios/issues/5298 - Improved error messages and moved map configuration to the BuildSettings 2022-01-04 17:33:32 +02:00
Stefan Ceriu
6a46c42cfd vector-im/element-ios/issues/5298 - Implemented location sharing from the input toolbar action menu. 2022-01-04 17:33:32 +02:00
ismailgulek
ca36f99a08
Merge branch 'develop' into ismail/5068_start_thread 2022-01-04 15:28:19 +03:00
SBiOSoftWhare
9e8e8b7fad Settings: Add enable room message bubbles parameter. 2022-01-03 18:30:59 +01:00
Gil Eluard
f7cb26b1ff Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces
# Conflicts:
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/SupportingFiles/Riot-Bridging-Header.h
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
2021-12-27 11:59:10 +01:00
Gil Eluard
443401838f Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces
# Conflicts:
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/SupportingFiles/Riot-Bridging-Header.h
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
2021-12-27 11:48:36 +01:00
Gil Eluard
835e6085a3 Merge branch 'develop' into gil/143_create_public_space
# Conflicts:
#	Common/Mock/MockAppScreens.swift
2021-12-23 15:28:41 +01:00
Gil Eluard
81951176c3 SP2: Adding Rooms to Spaces element-ios#5230
- Implemented designs with new & existing tabs in a bottom sheet
- Replaced rough edge warnings from space panel overflow with working journeys
2021-12-23 14:08:00 +01:00
Doug
5361298bfc Improve iPad layout. Add separate debug configuration. 2021-12-16 17:01:22 +00:00
Doug
59486c824a Add accessibility labels/hints. Fix tests. Show analytics prompt to everyone. 2021-12-16 17:01:22 +00:00
Doug
932eca82cc Support link/html in analytics prompt strings.
Show the new prompt to everyone, even if they previously opted out.
Add docs to Analytics.
2021-12-16 17:01:22 +00:00
Doug
8eab27ab8e Add AnalyticsPrompt to SwiftUI target and replace old UIAlertController. 2021-12-16 17:01:22 +00:00
Doug
6f94303cdc Begin migration from Matomo to PostHog
Add CocoaPods-Keys.
2021-12-16 16:59:26 +00:00
Gil Eluard
791b26a963 Merge branch 'gil/5228_let_people_know_when_rooms_have_moved' into gil/5224_space_creation 2021-12-15 14:52:57 +01:00
Gil Eluard
f4abcb2e22 Let people know when rooms have moved element-ios
- Added coach message view
2021-12-15 14:51:26 +01:00
Gil Eluard
8e327340b4 Merge branch 'gil/5225_invite_to_space_in_room_landing' into gil/5224_space_creation
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Images.swift
#	Riot/Generated/Strings.swift
2021-12-14 11:00:02 +01:00
Gil Eluard
19ed01028c Merge branch 'gil/5225_invite_to_space_in_room_landing' into gil/5224_space_creation
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Images.swift
#	Riot/Generated/Strings.swift
2021-12-14 09:53:07 +01:00
Gil Eluard
7242043f54 Invite to Space in room landing #5225
- added room option bottom sheet
2021-12-13 22:16:02 +01:00
Gil Eluard
4e50a1ac46 Merge branch 'develop' into gil/5225_invite_to_space_in_room_landing
# Conflicts:
#	Riot/Modules/Room/RoomCoordinator.swift
2021-12-13 15:09:40 +01:00
Gil Eluard
de170514bb Merge branch 'develop' into gil/143_create_public_space 2021-12-13 09:03:36 +01:00
Gil Eluard
badba94a87 Space panel overflow journeys & rough edge warnings #5227
- space menu additions according to new requirements
2021-12-10 18:01:56 +01:00
Gil Eluard
cf453feb02 Implement FAB journeys & rough edge warnings element-ios#5226
- List of Space members with search
- Invite interactions
- Join room from list
- Implement add room button, with rough edge warning.
2021-12-10 09:59:10 +01:00
ismailgulek
d5dc6928ea
Merge branch 'ismail/5092_thread_list' into ismail/5094_thread_links 2021-12-10 11:08:01 +03:00
ismailgulek
da9407f062
Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list 2021-12-10 11:07:27 +03:00
ismailgulek
1f918c921d
Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions 2021-12-10 11:03:00 +03:00
Gil Eluard
60f071ee9b Invite to Space in room landing #5225
- add share invite link to contacts screen
- Fixed regression
2021-12-09 16:12:44 +01:00
ismailgulek
d7b18bb223
Apply MatrixKit PR changes 2021-12-09 16:57:43 +03:00
ismailgulek
e3a47a59f9
Merge branch 'develop' into ismail/5068_start_thread 2021-12-09 15:25:14 +03:00
Gil Eluard
9c29b62075 [iOS] Create public space #143
- Update after design review
2021-12-09 09:04:21 +01:00
Stefan Ceriu
d5982e813b vector-im/element-ios/issues/5114 - Polls in the timeline. 2021-12-09 09:37:02 +02:00
Gil Eluard
30c3c3da3b [iOS] Create public space #143
- Update after design review
2021-12-01 23:56:59 +01:00
ismailgulek
11ba0958b1
Merge branch 'ismail/5092_thread_list' into ismail/5094_thread_links 2021-11-30 01:54:56 +03:00
ismailgulek
7f53684742
Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list 2021-11-30 01:34:44 +03:00
ismailgulek
5edcb644ea
Make remove actions destructive & move remove action to the bottom 2021-11-30 01:29:52 +03:00
ismailgulek
7b57570119
Implement actions for a thread 2021-11-25 14:55:44 +03:00
ismailgulek
c991f6aba4
Update deleted message design 2021-11-25 01:33:37 +03:00
Gil Eluard
87d54ad916 [iOS] Create public space #143
- Initial space creation flow
2021-11-23 09:35:32 +01:00
ismailgulek
cf286a6610
Add thread list empty view 2021-11-22 16:16:15 +03:00
ismailgulek
e8222ad50c
Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list 2021-11-22 14:59:07 +03:00
ismailgulek
415cf36854
Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions 2021-11-22 12:26:41 +03:00
ismailgulek
fc87a3534d
Move more button out of the title view & remove weird constraints 2021-11-22 12:22:53 +03:00
ismailgulek
4e739a7943
Add my threads filtering 2021-11-19 03:36:51 +03:00
ismailgulek
485227b94e
Generate classes 2021-11-16 17:14:57 +03:00
ismailgulek
ed390db60a
Add new action for the thread root event in thread view 2021-11-12 17:25:58 +03:00
ismailgulek
a319f076b1
Merge branch 'develop' into ismail/5068_start_thread 2021-11-11 21:43:16 +03:00
Stefan Ceriu
30ff8a65fb vector-im/element-ios/issues/5114 - Poll creation screen
- added input toolbar poll creation action.
- reordered input toolbar actions as per designs.
- added multiline text field and extracted common components.
2021-11-11 11:24:28 +02:00
ismailgulek
44d8d7e5fd
Create thread title string 2021-11-11 01:02:47 +03:00
ismailgulek
d80aba0793
Add thread option to an event if the labs setting enabled 2021-11-09 15:24:08 +03:00
ismailgulek
1e7c9bbd72
Add labs setting for threads 2021-11-09 15:18:18 +03:00
ismailgulek
788e817617
Add context menu item 2021-11-03 13:36:18 +03:00
Doug
4d4612e8e7 Send videos as 320p to encrypted rooms. 2021-10-29 10:50:56 +01:00
Doug
7a096a7df5 Use footers for app and discovery information.
Remove Invite Friends button from settings.
Reorganise Advanced and Other settings.
Rename Other to About.
2021-10-20 17:40:39 +01:00
Stefan Ceriu
6f7a9145e4
Merge pull request #5014 from vector-im/stefan/messageForwarding
Message forwarding
2021-10-19 16:17:07 +03:00
Stefan Ceriu
b6514349fb vector-im/element-ios/issues/5009 - Refactored share extension and started using the shared code directly in the main application. 2021-10-18 16:40:48 +03:00
Gil Eluard
07e539a40d Merge branch 'develop' into gil/4570_home_space_data_filtering 2021-10-15 14:20:04 +02:00
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
Gil Eluard
abfddff1cc [Spaces] M10.4.1 Home space data filtering #4570
- Added settings menu for Home space
2021-10-07 15:37:20 +02: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
Gil Eluard
ca7bf18f76 [Spaces] M10.6.1 Handle space link #4498
- Update after code review
2021-09-23 17:15:32 +02: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
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