felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-23 01:52:44 +02:00
Code Issues Packages Projects Releases Wiki Activity
16,495 Commits 1 Branch 67 Tags
8a5a8b4eec87175573d3995ae8a63f1300a10e93
Commit Graph

755 Commits

Author SHA1 Message Date
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
Gil Eluard b4e7d9724d 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 044367bda5 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 80c3cd31e2 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 6723e7e867 Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-17 11:37:41 +03:00
ismailgulek 7a74dc422f Merge branch 'develop' into ismail/5068_start_thread 2022-01-17 11:35:10 +03:00
Doug 1ccdc23c8e Add onboarding splash screen strings for Weblate. 2022-01-14 15:05:54 +00:00
Gil Eluard f9a4890459 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 ce226cff8a 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 f91a7990d2 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 5846ce52ed Update strings 2022-01-11 15:23:22 +03:00
Gil Eluard 350d605eec 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 c28af1644d Toast resources 2022-01-06 02:39:46 +03:00
Stefan Ceriu 43a9371214 vector-im/element-ios/issues/5298 - Various tweaks following code review. 2022-01-04 17:33:32 +02:00
Stefan Ceriu 0a852eb371 vector-im/element-ios/issues/5298 - Settings screen toggle for disabling location sharing. 2022-01-04 17:33:32 +02:00
Stefan Ceriu cedf727867 vector-im/element-ios/issues/5298 - Allow sharing locations to other system apps. 2022-01-04 17:33:32 +02:00
Stefan Ceriu 5a3bab92ec 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 cef0c4f2d4 vector-im/element-ios/issues/5298 - Implemented location sharing from the input toolbar action menu. 2022-01-04 17:33:32 +02:00
ismailgulek 2e28cb0750 Merge branch 'develop' into ismail/5068_start_thread 2022-01-04 15:28:19 +03:00