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

707 commits

Author SHA1 Message Date
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
a7c6fdb718 Remove duplicate strings from MatrixKit 
And a few from Vector for en and pr
 2022-03-03 09:34:54 +00:00
Doug
c32a27b8ce Merge MatrixKit strings into Vector strings. 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
Doug
318d985f13
Merge pull request #5698 from vector-im/doug/5653_ftue_analytics_prompt 
Prepare onboarding flow for personalisation screens.
 2022-02-28 17:25:19 +00:00
Doug
f4d223816f Move congratulations strings to Untranslated.strings. 
Update after PR Feedback
 2022-02-28 14:28:09 +00:00
Stefan Ceriu
bf37be670e Added swiftgen step for generating strings that won't be exposed to Weblate but still part of VectorL10n. 2022-02-28 12:37:22 +00: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
Doug
dc02b24c72 Prepare onboarding flow for personalisation screens. 
Add a BuildSetting to control the display of the personalisation screens.
Add a property to delay the AuthenticationCoordinator from showing any screens.
Add Congratulations screen to onboarding flow.
 2022-02-25 11:27:27 +00: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
Elsie Hupp
4bccbac783 Clarify "password" as "Matrix account password" 2022-02-08 10:47:30 +02: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
ismailgulek
67da0c0955
Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-26 14:27:25 +03: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
ismailgulek
c23a69c338
Fix review remarks 2022-01-25 23:59:19 +03: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