felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-25 11:02:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
33,392 Commits 1 Branch 67 Tags
84d4da2e42bb83eda3e5932fe8aac087a6cd96db
Commit Graph

182 Commits

Author SHA1 Message Date
Frank Rotermund bf76058997 chore: Update to FOSS 1.11.31 (MESSENGER-7610) 
Merge commit '822cbc5076da248fa7b997a5e3e906b03c4a09f7' into feature/7610_FOSS_Merge_1_11_31

# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile
#	Podfile.lock
#	README.md
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/ContextMenu/Services/RoomContextActionService.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
#	fastlane/Fastfile
 2025-08-27 07:39:26 +02:00
Mauro Romito 1a23b84882 replaced deprecated function with the new one to check for power levels 2025-07-22 16:17:48 +02:00
Frank Rotermund 67df1a3e95 chore: FOSS Merge 1.27.11 (MESSENGER-7276) 
Merge commit 'af0b6d4be985d9f26e5111d3fa01389c7321949f' into feature/7276_FOSS_Merge_1_27_11

# Conflicts:
#	Config/AppVersion.xcconfig
#	Gemfile.lock
#	IDETemplateMacros.plist
#	Podfile
#	Podfile.lock
#	README.md
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Room/CellData/RoomBubbleCellData.m
#	Riot/target.yml
#	RiotNSE/NotificationService.swift
#	RiotSwiftUI/Modules/Authentication/ServerSelection/AuthenticationServerSelectionModels.swift
#	RiotSwiftUI/Modules/Authentication/ServerSelection/AuthenticationServerSelectionViewModel.swift
#	RiotSwiftUI/Modules/Authentication/ServerSelection/Coordinator/AuthenticationServerSelectionCoordinator.swift
#	RiotSwiftUI/Modules/Authentication/ServerSelection/View/AuthenticationServerSelectionScreen.swift
#	RiotSwiftUI/Modules/Room/CompletionSuggestion/Service/CompletionSuggestionService.swift
#	fastlane/Fastfile
 2025-05-16 14:06:20 +02:00
Mauro Romito 77bae312d0 added commercial license 2025-01-23 12:19:12 +01:00
JanNiklas Grabowski b298dedc22 chore: update from foss 1.11.19 (MESSENGER-6656) 
Merge commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1' into feature/foss_update_1_11_19

* commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1':
  finish version++
  version++
  comments
  update submodule
  remove obsolete tests
  removed unused code
  update submodule
  fix
  Libolm removal
  update license macro
  update license
  Prepare for new sprint

# Conflicts:
#	Config/AppVersion.xcconfig
#	IDETemplateMacros.plist
#	LICENSE
#	README.md
#	Riot/Categories/MXSession+Riot.m
#	Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
#	Riot/Managers/KeyValueStorage/Extensions/Keychain.swift
#	Riot/Managers/KeyValueStorage/KeyValueStore.swift
#	Riot/Managers/KeyValueStorage/KeychainStore.swift
#	Riot/Managers/KeyValueStorage/MemoryStore.swift
#	Riot/Managers/PushNotification/PushNotificationService.m
#	Riot/Managers/Settings/RiotSettings.swift
#	Riot/Managers/Settings/Shared/RiotSharedSettings.swift
#	Riot/Modules/Analytics/AnalyticsUIElement.swift
#	Riot/Modules/Application/AppCoordinator.swift
#	Riot/Modules/Application/LegacyAppDelegate.h
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/Legacy/AuthenticationViewController.h
#	Riot/Modules/Authentication/Legacy/AuthenticationViewController.m
#	Riot/Modules/Authentication/Legacy/Views/AuthInputsView.h
#	Riot/Modules/Authentication/Legacy/Views/AuthInputsView.m
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Common/WebViewController/WebViewViewController.m
#	Riot/Modules/Contacts/Details/ContactDetailsViewController.m
#	Riot/Modules/Contacts/Views/ContactTableViewCell.m
#	Riot/Modules/Favorites/FavouritesViewController.h
#	Riot/Modules/Favorites/FavouritesViewController.m
#	Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
#	Riot/Modules/People/PeopleViewController.h
#	Riot/Modules/People/PeopleViewController.m
#	Riot/Modules/Room/ContextualMenu/ReactionsMenu/ReactionsMenuViewModel.swift
#	Riot/Modules/Room/DataSources/RoomDataSource.m
#	Riot/Modules/Room/Files/RoomFilesViewController.m
#	Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/Room/Settings/RoomSettingsViewController.m
#	Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCell.swift
#	Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCellContentView.swift
#	Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroViewData.swift
#	Riot/Modules/Room/TimelineCells/RoomTimelineCellIdentifier.h
#	Riot/Modules/Rooms/RoomsViewController.h
#	Riot/Modules/Rooms/ShowDirectory/Cells/Network/DirectoryNetworkTableHeaderFooterView.swift
#	Riot/Modules/Rooms/ShowDirectory/Cells/Room/DirectoryRoomTableViewCell.swift
#	Riot/Modules/Rooms/ShowDirectory/PublicRoomsDirectoryViewModel.swift
#	Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyCoordinator.swift
#	Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyViewController.swift
#	Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseCoordinator.swift
#	Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseViewController.swift
#	Riot/Modules/Secrets/Recover/SecretsRecoveryCoordinator.swift
#	Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.swift
#	Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModel.swift
#	Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModelType.swift
#	Riot/Modules/SetPinCode/PinCodePreferences.swift
#	Riot/Modules/SetPinCode/SetupBiometrics/BiometricsAuthenticationPresenter.swift
#	Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m
#	Riot/Modules/Settings/Security/SecurityViewController.m
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/Modules/SplitView/SplitViewCoordinator.swift
#	Riot/Modules/SplitView/SplitViewCoordinatorType.swift
#	Riot/Modules/StartChat/StartChatViewController.m
#	Riot/Modules/TabBar/MasterTabBarController.h
#	Riot/Modules/TabBar/MasterTabBarController.m
#	Riot/Utils/EventFormatter.m
#	Riot/Utils/HTMLFormatter.swift
#	Riot/Utils/Tools.m
#	RiotNSE/NotificationService.swift
 2024-10-18 15:45:54 +02:00
Mauro Romito 12837d4b89 update license 2024-09-25 12:24:52 +02:00
JanNiklas Grabowski 6c22fa37f1 Merge commit '56d9e1f6a55a93dc71149ae429eaa615a98de0d5' into feature/6076_foss_merge 
* commit '56d9e1f6a55a93dc71149ae429eaa615a98de0d5': (79 commits)
  finish version++
  version++
  Translated using Weblate (Hungarian)
  Translated using Weblate (Italian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Hungarian)
  Translated using Weblate (Slovak)
  Translated using Weblate (Swedish)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Albanian)
  Translated using Weblate (Estonian)
  Translated using Weblate (Estonian)
  updated the submodule
  updated SDK
  Update the SDK. (#7819)
  Prepare for new sprint
  finish version++
  version++
  fix
  Changelog.
  ...

# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile
#	Podfile.lock
#	Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	Riot/Managers/Settings/RiotSettings.swift
#	Riot/Modules/Analytics/Analytics.swift
#	Riot/Modules/Analytics/DecryptionFailure.swift
#	Riot/Modules/Analytics/PHGPostHogConfiguration.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewAction.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewModel.swift
#	Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/Utils/EventFormatter.m
#	Riot/Utils/Tools.m
#	RiotNSE/target.yml
#	fastlane/Fastfile
#	project.yml
 2024-08-19 12:52:38 +02:00
Stefan Ceriu b691d02a20 Add support for reporting rooms on the room details screen too 2024-06-12 17:55:36 +03:00
Arnfried Griesert 6068b228a7 Merged element 1.10.9 into bum 2023-04-11 11:46:44 +02:00
Nicolas Mauri c3ef966758 Fix: corner radius for small SpaceAvatarView 2023-03-20 14:32:55 +01:00
Arnfried Griesert e5d97ed154 merged element-ios 1.10.5 into 4409_basis_update_1_10_5 2023-03-16 12:19:26 +01:00
Mauro Romito fc1c22c08c refactor completed 2023-03-06 14:59:03 +01:00
JanNiklas Grabowski 1768fb5eee Merge commit 'aaadcc73674cc8886e363693a7d7c08ac9b4f516' into feature/4260_merge_foss_1_10_2 
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile
#	Podfile.lock
#	Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
#	Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift
#	Riot/Modules/Home/AllChats/AllChatsViewController.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
#	Riot/Modules/Room/Settings/RoomSettingsViewController.m
#	fastlane/Fastfile
 2023-02-15 14:56:55 +01:00
Flavio Alescio 2f51f66d5e code restyle for poll detail 2023-01-31 16:03:38 +01:00
Flavio Alescio 5ea70aacd8 added view in timeline action, added tests 2023-01-27 15:07:32 +01:00
Frank Rotermund f9409804b1 Merge commit 'a7b7fffd00663340f1684fa8d096dc20b4c9719e' into feature/basis_update_192 
# Conflicts:
#	Config/AppVersion.xcconfig
#	Config/BuildSettings.swift
#	DesignKit/Source/ColorsSwiftUI.swift
#	DesignKit/Source/FontsSwiftUI.swift
#	DesignKit/Source/ThemeV2.swift
#	DesignKit/Variants/Colors/Dark/DarkColors.swift
#	DesignKit/Variants/Colors/Light/LightColors.swift
#	Podfile.lock
#	Riot/Assets/de.lproj/InfoPlist.strings
#	Riot/Assets/de.lproj/Vector.strings
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Images.swift
#	Riot/Generated/Strings.swift
#	Riot/Managers/PushNotification/PushNotificationService.m
#	Riot/Managers/Settings/RiotSettings.swift
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.h
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Communities/Home/GroupHomeViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/SetPinCode/PinCodePreferences.swift
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/Modules/TabBar/MasterTabBarController.h
#	Riot/Modules/TabBar/MasterTabBarController.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
#	fastlane/Fastfile
#	project.yml
 2022-09-19 14:42:25 +02:00
Frank Rotermund 226e55caf7 MESSENGER-3304 string in separate files 2022-09-19 11:53:45 +02:00
Andy Uhnak a9d1e84252 Track all errors in Sentry 2022-08-23 08:14:59 +01:00
Gil Eluard c1f948dab6 App Layout: added space invites in space bottom sheet 
- UI tweaks
 2022-08-22 13:42:37 +02:00
Gil Eluard 03fc5676bb App Layout: added space invites in space bottom sheet 2022-08-21 11:07:21 +02:00
Johannes Marbach ce4c8b186c Expand all if and guard constructs involving @available(iOS 14... or #available(iOS 14... 
Signed-off-by: Johannes Marbach <johannesm@element.io>
 2022-06-23 10:05:46 +02:00
Johannes Marbach 868fd7e0c8 Remove all @available(iOS 14... annotations 2022-06-23 09:47:38 +02:00
SBiOSoftWhare b2a2dba2ba Merge develop in 6081_lls_screen_integration 2022-05-04 16:53:49 +02:00
SBiOSoftWhare ff11b016ed RoomCoordinator: Handle live location viewer and stop sharing. 2022-05-03 16:04:36 +02:00
Gil Eluard cbe2e135ba Fail to open a sub space #5965 (#6080) 
* Fail to open a sub space #5965

- Fixed
 2022-05-03 11:22:15 +02:00
SBiOSoftWhare 2a4534b4ef RoomCoordinator: Handle live location viewer showing. 2022-04-29 11:08:09 +02:00
Gil Eluard 987eb7d5c0 4850 bring leaving space experience in line with web (#6062) 
* Bring leaving space experience in line with Web #4850

- Done
 2022-04-27 13:31:14 +02:00
Doug 7bc6bce163 Fix some warnings. 2022-04-13 17:21:11 +01:00
ismailgulek d8e2f9240d Fix crash #2 2022-04-12 00:56:58 +03:00
Gil Eluard c0f8458371 Wrong copy for upgrade room message (#6003) 
* Wrong copy for upgrade room message

- fixed
 2022-04-11 15:46:08 +02:00
Gil Eluard 1adfa904ae Add support for Apple context menus in matrix items list screens (#5963) 2022-04-04 20:07:06 +02:00
Gil Eluard cd965b6db9 Not possible to join an empty room on some suggested rooms (#5950) 
* “It is not possible to join an empty room” on suggested rooms in a space #5170

- Fixed
 2022-03-30 19:38:05 +02:00
Andy Uhnak fadfa48f9f Join room loading indicators 2022-03-29 15:03:09 +01:00
Gil Eluard a76327da82 Space preview shows wrong number of members (#5934) 
Space preview shows wrong number of members #4842

- Fixed
 2022-03-28 15:35:00 +02:00
Gil Eluard 47d5f829f5 Merge pull request #5925 from vector-im/gil/5915-Cannot_view_space_invitations_from_system_notifications 
Can't view space invitations from system notifications
 2022-03-28 10:48:09 +02:00
Gil Eluard 583c1636e2 Can't view space invitations from system notifications #5915 
- Fixed
 2022-03-27 23:52:56 +02:00
Gil Eluard 4767c72c8a Sync space order with web #5134 2022-03-25 13:45:16 +01:00
Gil Eluard 858067af41 Merge pull request #5899 from vector-im/gil/5771_Update_suggested_room_preview 2022-03-23 20:03:26 +01:00
Gil Eluard 08d613fddb Add "Invite people" to the space menu in the left panel and update menu order #5810 
- update after review
 2022-03-23 11:24:36 +01:00
Gil Eluard 2cc1d3ac2e Update suggested room preview to behave the same way in all cases #5771 
- Done
 2022-03-23 10:58:41 +01:00
Gil Eluard 08f87dc5c7 Add "Invite people" to the space menu in the left panel and update menu order #5810 
- done
 2022-03-22 16:51:43 +01:00
SBiOSoftWhare 7e34d777bf RoomCoordinator: Update with new RoomViewControllerDelegate methods. 2022-03-17 16:59:30 +01:00
Gil Eluard 45797a7384 Merge branch 'develop' into gil/5769_add_trigger_to_join_and_view_room_metrics_event 
# Conflicts:
#	Riot/Modules/Analytics/Analytics.swift
 2022-03-17 13:59:24 +01:00
Gil Eluard 55154a2037 Merge pull request #5836 from vector-im/gil/5401_Instrument_metrics_for_the_IA_project 
Instrument metrics for iOS for the IA project #5401
 2022-03-17 11:55:55 +01:00
Gil Eluard e14227c836 Instrument metrics for iOS for the IA project #5401 
- Added last needed metrics
 2022-03-16 16:56:27 +01:00
Gil Eluard 0e5503f937 Crash after leaving empty space and all rooms #5825 
- fixed
 2022-03-16 14:52:06 +01:00
Gil Eluard c747ff86ac Add trigger to join and view room metrics events #5769 
- Added trigger for JoinedRoom event
- Tracking ViewRoom event for rooms and events
 2022-03-15 10:31:24 +01:00
Gil Eluard cdd66146d8 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
Gil Eluard acf7d0de13 Instrument missing screen metrics (#5764) 
* Instrument missing screen metrics

- Done
 2022-03-08 10:13:46 +01:00
Gil Eluard cf015c4ef2 selection impossible when filtering in add room screen #5757 (#5758) 
- Fixed
- Other minor code / UI tweaks
 2022-03-07 12:25:50 +01:00