Commit Graph

673 Commits

Author SHA1 Message Date
MaximeE ea83927c74 5720: Update from develop 2022-03-22 09:41:25 +01:00
Doug 052c8ba24a 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 a8626557c1 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
MaximeE 8ca6359c4c 5720: Update UI in location sharing View 2022-03-17 16:52:22 +01:00
SBiOSoftWhare bb76286740 Add live location banner strings. 2022-03-17 16:37:32 +01:00
Andy Uhnak f44107cfbb Merge branch 'master' into develop 2022-03-14 16:26:07 +00:00
Andy Uhnak 6cd479f716 Ignore the sender of a room invite without needing to join the room first 2022-03-11 16:24:40 +00:00
Gil Eluard 6dce767666 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 66bf8f0428 Rename profile as userAvatarAndName 2022-03-07 13:45:02 +01:00
Arnaud Ringenbach 6ae0a9cdb3 Use only latest profiles in the timeline (labs) 2022-03-07 13:45:02 +01:00
Gil Eluard da9c921efb 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 dfda5f09d9 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 bc55dbb11b 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 9edb20155f Track failed creation of attributed strings 2022-03-03 12:45:50 +00:00
Doug d7f8a3cef2 Remove duplicate strings from MatrixKit
And a few from Vector for en and pr
2022-03-03 09:34:54 +00:00
Doug fc96323fb7 Merge MatrixKit strings into Vector strings. 2022-03-03 09:34:54 +00:00
Gil Eluard cfb9021b92 Merge branch 'develop' into gil/SP1_space_creation 2022-03-01 10:15:13 +01:00
Gil Eluard dedcb069fb 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 dbe027e219 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 3ef9069e9f 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 af99903cea 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 f820fb3a3d 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 e4993d8ef1 Update activity indicators on leaving room
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-18 13:31:21 +00:00
Stefan Ceriu 1a27a9ceec vector-im/element-ios/issues/5609 - Add open in OSM location sharing option. 2022-02-17 19:11:08 +02:00
Gil Eluard 13f55fab91 SP2: Adding Rooms to Spaces #523o
- fixed SwiftUI Unit tests
2022-02-17 13:14:45 +01:00
aringenbach e788dc1b0b 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 8a7fb883f1 Replace kick by remove in all strings 2022-02-11 14:25:20 +01:00
Doug ee5d362b82 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
Elsie Hupp 8f3e37bcfc Clarify "password" as "Matrix account password" 2022-02-08 10:47:30 +02:00
Gil Eluard 77cbc6281e 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 0797dbbd1e 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 a3078cf6a2 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 7a61b83bb8 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 d7e9cbf7c4 Add the Use Case selection screen to the onboarding flow. 2022-02-04 16:10:38 +00:00
Gil Eluard 73e1d430da Merge branch gil/SP1_space_creation into gil/5230_SP2-Adding_Rooms_to_Spaces 2022-02-04 16:43:43 +01:00
Gil Eluard 4d6133ef85 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 03ac541f91 Update strings, fix missing symbol. 2022-02-03 18:30:39 +00:00
Stefan Ceriu de6d2a2fad Made StateStoreViewModel state mutable and removed the reducer for all the features using it. 2022-02-02 10:02:12 +02:00
ismailgulek 98dd950a35 Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-26 14:27:25 +03:00
Gil Eluard 1891aed59e 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 17667dada7 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
ismailgulek 785fe6b4e0 Fix review remarks 2022-01-25 23:59:19 +03:00
Gil Eluard 925ca81b04 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 872ab41f4a 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 3489d2f5cc Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-19 00:09:26 +03:00
ismailgulek e344dcceed Merge branch 'develop' into ismail/5068_start_thread 2022-01-19 00:07:52 +03:00
Stefan Ceriu e261a5310f 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 67e7db38c2 vector-im/element-ios/issues/5114 - Allow editing poll start events. 2022-01-18 20:05:10 +02:00
ismailgulek a4f7956d42 Add thread decoration views for search results, fix #5268 2022-01-18 14:46:22 +03:00
Gil Eluard 4c85c693e2 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