felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-23 18:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity
14,893 Commits 1 Branch 67 Tags
4e6b79571029a7b6ed4b79a1743d3487d6a90ceb
Commit Graph

204 Commits

Author SHA1 Message Date
Arnaud Ringenbach 5ab06d9f18 Merge branch 'develop' into aringenbach/5745_mandatory_secure_backup 
# Conflicts:
#	Riot/Modules/CreateRoom/EnterNewRoomDetails/EnterNewRoomDetailsViewModel.swift
 2022-03-10 10:35:20 +01:00
Arnaud Ringenbach 439743f9ff Force non-cancellable session verification when needed (account migration / interrupted authentication) 2022-03-09 11:45:03 +01:00
Gil Eluard 5229264d21 Merge branch 'develop' into gil/SP1_space_creation 2022-03-08 13:19:38 +01:00
Gil Eluard 4f43793313 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
Andy Uhnak eef9802e96 Use split controller's top navigation controller to present toasts 2022-03-08 08:34:45 +00:00
Andy Uhnak 9dbf34a308 Use new activity indicators on all tabs 2022-03-04 16:51:15 +00:00
Gil Eluard 42b4144323 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
Andy Uhnak 830feeb7c0 Enable home and room user indicators 2022-03-01 15:50:24 +00:00
Anderas 7c3a86c24d Merge pull request #5690 from vector-im/andy/5603_room_indicators 
Room activity indicators
 2022-03-01 13:08:29 +00:00
Gil Eluard 0abef4312e Merge branch 'develop' into gil/SP1_space_creation 2022-03-01 10:15:13 +01:00
Doug 709ea15631 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
Gil Eluard bca69bb7c8 SP3.1: Update room settings for Spaces #5231 
- Update after review
 2022-02-28 16:07:09 +01:00
Doug 4900c1018b 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
Andy Uhnak 559bb88ae4 Room user indicators 
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
 2022-02-25 10:47:53 +00:00
Anderas a5f3987bd1 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
David Langley 3fd31f3c7b Use protocol to get title from child VCs. 2022-02-23 11:41:05 +00:00
Andy Uhnak c9c8438250 Rename properties and arguments 2022-02-22 16:44:22 +00:00
Andy Uhnak 712d64204c Rename Activity to UserIndicator 2022-02-22 16:14:03 +00:00
Gil Eluard 079d50e733 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 ceb74c2f6e 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 82d6968091 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 9eae7c02bb Update activity indicators on leaving room 
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
 2022-02-18 13:31:21 +00:00
Doug 2256b522ab Move presentation of the loading spinner into AuthenticationCoordinator for new users. 
Also moves key verification out of a bridge presenter in AuthenticationVC and into the AuthenticationCoordinator.
 2022-02-17 17:31:43 +00:00
Andy Uhnak b0ee449c5d Implement home screen activity indicators 2022-02-16 11:48:26 +00:00
Gil Eluard df6d50b990 SP1.5: Let people know when rooms have moved #5228 
- Update after review
 2022-02-10 19:25:06 +01:00
Stefan Ceriu 4b1eb75fd3 Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195. 2022-02-10 08:43:18 +02:00
Gil Eluard d159d6d844 SP1.5: Let people know when rooms have moved #5228 
- Update after review
 2022-02-08 23:13:17 +01:00
Gil Eluard fd765a9288 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 5025029843 Merge branch gil/SP1_space_creation into gil/5230_SP2-Adding_Rooms_to_Spaces 2022-02-04 16:43:43 +01:00
Gil Eluard 63d3843bb0 Merge branch 'gil/SP1_space_creation' into gil/5228_let_people_know_when_rooms_have_moved 2022-02-04 14:31:26 +01:00
Gil Eluard f4fa9e97e3 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
Gil Eluard 308588736a Update Riot/Modules/TabBar/TabBarCoordinator.swift 
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
 2022-02-03 21:01:14 +01:00
ismailgulek cf2420669f Merge branch 'develop' into ismail/5096_thread_notifications 2022-02-01 01:23:00 +03:00
Doug 301fff2539 Merge pull request #5398 from vector-im/doug/5159_ftue_splash 
Add a splash screen before authentication is shown
 2022-01-28 15:34:26 +00:00
ismailgulek a13d5704dc Merge branch 'develop' into ismail/5096_thread_notifications 2022-01-27 03:20:25 +03:00
Doug c64d851148 Begin implementing an onboarding flow. 2022-01-26 14:25:48 +00:00
Doug 5fb199af7c Start implementing FTUE splash screens. 
Present splash screens from AuthenticationViewController
 2022-01-26 14:24:00 +00:00
ismailgulek 9c5b83a1b3 Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-26 14:27:25 +03:00
ismailgulek f7694e27cb Fix review remarks 2022-01-25 23:59:19 +03:00
Gil Eluard d23f24b9ce 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
ismailgulek 81405b4dd6 Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications 2022-01-19 00:12:40 +03:00
ismailgulek 805c1adcf4 Fix thread screen call button case 2022-01-18 03:13:22 +03: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
ismailgulek 26a6060e3e Merge branch 'ismail/5068_start_thread' into ismail/5096_thread_notifications 2022-01-17 11:39:25 +03:00
ismailgulek 7e92b7cef5 Merge branch 'develop' into ismail/5068_start_thread 2022-01-17 11:35:10 +03:00
Gil Eluard b4eee99d03 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 ea9183d70e 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
ismailgulek 948dd8eec0 Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications 2022-01-12 13:58:48 +03:00
Stefan Ceriu 49c787d987 vector-im/element-ios/issues/5298 - Various tweaks following code review. 2022-01-04 17:33:32 +02:00
ismailgulek 9cd27d293c Merge branch 'develop' into ismail/5068_start_thread 2022-01-04 15:28:19 +03:00