felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-22 01:22:46 +02:00
Code Issues Packages Projects Releases Wiki Activity
33,069 Commits 1 Branch 67 Tags
cc9ba7674ef0d069328480bc55f0299b4fd95682
Commit Graph

134 Commits

Author SHA1 Message Date
Gil Eluard 047342265b 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 a8bcd8faa2 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 2950f25de9 Merge branch 'develop' into gil/143_create_public_space 
# Conflicts:
#	Common/Mock/MockAppScreens.swift
 2021-12-23 15:28:41 +01:00
Gil Eluard e4b0699ab7 Merge branch 'develop' into gil/143_create_public_space 
# Conflicts:
#	Common/Mock/MockAppScreens.swift
 2021-12-23 15:28:41 +01:00
Gil Eluard 1fb13415f9 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
Gil Eluard 7e09ccbf6e 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 315f5a9cc4 Add AnalyticsScreenTimer and track more screens. 
Update Analytics with new methods in MXAnalyticsDelegate.
 2021-12-16 16:59:45 +00:00
Doug 47348b7f34 Add AnalyticsScreenTimer and track more screens. 
Update Analytics with new methods in MXAnalyticsDelegate.
 2021-12-16 16:59:45 +00:00
Gil Eluard eb2c795b75 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 747533b237 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 1bb99ac215 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 50c50a0a3c 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 4890ce2108 [iOS] Create public space #143 
- Update after design review
 2021-12-01 23:56:59 +01:00
Gil Eluard 1473636c46 [iOS] Create public space #143 
- Update after design review
 2021-12-01 23:56:59 +01:00
Gil Eluard 272d778779 [iOS] Create public space #143 
- Initial space creation flow
 2021-11-23 09:35:32 +01:00
Gil Eluard fda0568d88 [iOS] Create public space #143 
- Initial space creation flow
 2021-11-23 09:35:32 +01:00
Gil Eluard 248ad6e8d4 Spaces still visible after logging in with another account #4916 2021-09-27 12:51:28 +02:00
Gil Eluard 5225d3fc4b Spaces still visible after logging in with another account #4916 2021-09-27 12:51:28 +02:00
Gil Eluard 1403d464ee [Spaces] M10.6.1 Handle space link #4498 
- Fixed universal links
- Added support for space links
 2021-09-22 14:58:19 +02:00
Gil Eluard 3db7e10c15 [Spaces] M10.6.1 Handle space link #4498 
- Fixed universal links
- Added support for space links
 2021-09-22 14:58:19 +02:00
Gil Eluard 53ae49b199 Merge branch 'spaces' into gil/4497_space_preview_bottom_sheet 
# Conflicts:
#	Riot/Modules/SideMenu/SideMenuCoordinator.swift
 2021-09-14 17:53:46 +02:00
Gil Eluard 158a968bcc Merge branch 'spaces' into gil/4497_space_preview_bottom_sheet 
# Conflicts:
#	Riot/Modules/SideMenu/SideMenuCoordinator.swift
 2021-09-14 17:53:46 +02:00
Gil Eluard 0da7d70b21 [Spaces] M10.8 Browsing users in a space #4682 
- Fixed build issue on Jenkins
 2021-09-14 17:22:48 +02:00
Gil Eluard d5e0629dcf [Spaces] M10.8 Browsing users in a space #4682 
- Fixed build issue on Jenkins
 2021-09-14 17:22:48 +02:00
Gil Eluard 99cbeab6f3 [Spaces] M10.8 Browsing users in a space #4682 
- Update after code review
 2021-09-14 15:29:16 +02:00
Gil Eluard 6caad7f61c [Spaces] M10.8 Browsing users in a space #4682 
- Update after code review
 2021-09-14 15:29:16 +02:00
Gil Eluard de09af397f [Spaces] M10.8 Browsing users in a space #4682 
- Update after code review
 2021-09-14 11:45:33 +02:00
Gil Eluard aa931a3c1a [Spaces] M10.8 Browsing users in a space #4682 
- Update after code review
 2021-09-14 11:45:33 +02:00
Gil Eluard ee0deb258e [Spaces] M10.8 Browsing users in a space #4682 
- Update after design review
 2021-09-13 16:03:56 +02:00
Gil Eluard 144a608726 [Spaces] M10.8 Browsing users in a space #4682 
- Update after design review
 2021-09-13 16:03:56 +02:00
Gil Eluard eaeed470a9 Merge branch 'gil/4571_explore_rooms' into gil/4682_browsing_users_in_a_space 
# Conflicts:
#	Riot/Modules/SideMenu/SideMenuCoordinator.swift
 2021-09-13 10:23:21 +02:00
Gil Eluard 661242336c Merge branch 'gil/4571_explore_rooms' into gil/4682_browsing_users_in_a_space 
# Conflicts:
#	Riot/Modules/SideMenu/SideMenuCoordinator.swift
 2021-09-13 10:23:21 +02:00
Gil Eluard e1118b1f57 [Spaces] M10.7 Explore rooms #4571 
- Update after code review
 2021-09-13 10:06:36 +02:00
Gil Eluard 8b53599ac9 [Spaces] M10.7 Explore rooms #4571 
- Update after code review
 2021-09-13 10:06:36 +02:00
Gil Eluard fd5d96aff9 [Spaces] M10.6 Space preview bottom sheet #4497 2021-09-06 07:46:43 +03:00
Gil Eluard 53c3cd7fc6 [Spaces] M10.6 Space preview bottom sheet #4497 2021-09-06 07:46:43 +03:00
Gil Eluard 66f084b85c [Spaces] M10.8 Browsing users in a space #4682 
- Renamed coordinators
 2021-09-02 09:34:25 +03:00
Gil Eluard 6aa9f0f5c7 [Spaces] M10.8 Browsing users in a space #4682 
- Renamed coordinators
 2021-09-02 09:34:25 +03:00
Gil Eluard 3decd0200d Merge branch 'gil/4571_explore_rooms' into gil/4682_browsing_users_in_a_space 
# Conflicts:
#	Riot/Modules/SideMenu/SideMenuCoordinator.swift
 2021-09-02 07:51:55 +03:00
Gil Eluard 8bf8b5d99e Merge branch 'gil/4571_explore_rooms' into gil/4682_browsing_users_in_a_space 
# Conflicts:
#	Riot/Modules/SideMenu/SideMenuCoordinator.swift
 2021-09-02 07:51:55 +03:00
Gil Eluard 8a2ba8bf44 [Spaces] M10.7 Explore rooms #4571 
- Update after review
 2021-09-01 18:12:08 +03:00
Gil Eluard 26b4344fe1 [Spaces] M10.7 Explore rooms #4571 
- Update after review
 2021-09-01 18:12:08 +03:00
Gil Eluard a6328b8f35 [Spaces] M10.8 Browsing users in a space #4682 
- Added MVVM classes
- roughly integrated `RoomParticipantsViewController` to the MVVM
 2021-08-10 20:26:27 +02:00
Gil Eluard 7d7ed333fe [Spaces] M10.8 Browsing users in a space #4682 
- Added MVVM classes
- roughly integrated `RoomParticipantsViewController` to the MVVM
 2021-08-10 20:26:27 +02:00
Gil Eluard e197268ed2 [Spaces] M10.7 Explore rooms #4571 
- Implemented navigation between space context menu and Explore Room screen
- Populate Explore rooms screen with the first level of space children
 2021-08-05 14:36:38 +02:00
Gil Eluard 0ec3c8005d [Spaces] M10.7 Explore rooms #4571 
- Implemented navigation between space context menu and Explore Room screen
- Populate Explore rooms screen with the first level of space children
 2021-08-05 14:36:38 +02:00
Gil Eluard 01bc065261 Merge branch 'gil/4509_show_spaces_in_left_panel' into gil/4494_space_menu 2021-07-26 12:03:31 +02:00
Gil Eluard e97b2cd448 Merge branch 'gil/4509_show_spaces_in_left_panel' into gil/4494_space_menu 2021-07-26 12:03:31 +02:00
Gil Eluard f61a5751d2 Merge branch 'element_4509' into gil/4509_show_spaces_in_left_panel 2021-07-26 12:03:04 +02:00
Gil Eluard 18a8bd088e Merge branch 'element_4509' into gil/4509_show_spaces_in_left_panel 2021-07-26 12:03:04 +02:00