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

525 commits

Author SHA1 Message Date
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
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
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