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

39 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
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 571a1a2d00 MESSENGER-5806 bugfix location view shown after deletion 2024-03-27 16:31:11 +01:00
Arnfried Griesert 1c0ef0ca52 merged element 1.10.12 into bum 2023-06-07 15:45:59 +02:00
Nicolas Mauri 6179453c57 Fix: Calculation of the frame for a bubble component 2023-04-20 10:14:51 +02:00
Frank Rotermund 0fca000b8d Merge commit '3d672a05b2a7117ade2e4e87bd2b5762063d7922' into feature/3977_merge_element_1_9_13 
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
#	Riot/Modules/LaunchLoading/LaunchLoadingView.swift
#	Riot/Modules/LaunchLoading/LaunchLoadingView.xib
#	Riot/Modules/MatrixKit/Models/Account/MXKAccount.m
#	Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellData.m
#	Riot/Modules/Room/TimelineCells/Styles/Bubble/BubbleRoomTimelineCellProvider.m
#	Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
#	Riot/Modules/TabBar/MasterTabBarController.m
#	fastlane/Fastfile
 2022-12-19 14:36:30 +01:00
Frank Rotermund ab8c98183d PSB-196 fix message bubbles by removing timestamps 2022-11-15 15:26:53 +01:00
Stefan Ceriu c59ec916ca Fixes vector-im/element-ios/issues/6441 - Incorrect timeline item text height calculation 2022-11-08 15:16:55 +02:00
Stefan Ceriu fbab7d717c Revert "Fixes vector-im/element-ios/issues/6441 - Incorrect timeline item text height calculation (#6679)" 
This reverts commit 405c2d8e324c08c1a40e037aeb3c54e93f30bc9f.
 2022-11-08 15:16:55 +02:00
Stefan Ceriu 5795d80d65 Revert "Fix timeline items text height calculation" 
This reverts commit 8f9eddee501702de84192316bd5b2ff9512d681a.
 2022-11-08 15:16:55 +02:00
Stefan Ceriu bc94544bfb Revert "Replace attributed string height calculation with a more reliable implementation" 
This reverts commit 81773cd1e515cc391c1f21b499f61141cb03c810.
 2022-11-08 15:16:55 +02:00
Andy Uhnak 726aa29323 Decorate events decrypted with untrusted sessions 2022-09-28 17:04:45 +01:00
Stefan Ceriu 95cda63747 Replace attributed string height calculation with a more reliable implementation 2022-09-12 18:18:31 +03:00
Stefan Ceriu c913461f4d Fix timeline items text height calculation 2022-09-11 11:07:37 +03:00
Stefan Ceriu c94d019d95 Fixes vector-im/element-ios/issues/6441 - Incorrect timeline item text height calculation (#6679) 2022-09-06 12:05:15 +03:00
Doug 57f92307f2 Remove flairs and related groups. 2022-08-09 15:04:54 +01:00
ismailgulek 5957a1c993 Merge pull request #6297 from vector-im/ismail/5731_room_header_invite 2022-06-17 15:55:34 +03:00
aringenbach 4c8bed38c2 Use latest user data for mention pills 2022-06-16 17:07:47 +02:00
Gil Eluard 0015993b8e Invites are collapsed incorrectly (#6300) 
* Invites are collapsed incorrectly

- use invitee avatar instead of the target avatar for collapsed membership cell
 2022-06-15 20:11:03 +02:00
ismailgulek 84dcbbf001 Introduce canInvitePeople on bubble cell data 2022-06-14 18:01:24 +03:00
ismailgulek 9b542fd8f8 Move hasThreadRoot into MXKRoomBubbleCellDataStoring protocol 2022-06-13 13:52:46 +03:00
Stefan Ceriu 7dbe5b17e9 Attempt at fixing [CALayer animationForKey] crashes. 2022-05-23 10:26:59 +03:00
Arnaud Ringenbach cfeae5bc64 Rename profile as userAvatarAndName 2022-03-07 13:45:02 +01:00
Arnaud Ringenbach 1f59ed74e7 Revamp refreshProfiles as setRoomState 2022-03-07 13:45:02 +01:00
Arnaud Ringenbach 4eafe7fd9a Rename dataSource2 parameters and handle target profiles 2022-03-07 13:45:02 +01:00
Arnaud Ringenbach 91d3411326 Handle use only latest profile live refreshes 2022-03-07 13:45:02 +01:00
Arnaud Ringenbach a6ed656107 Use only latest profiles in the timeline (labs) 2022-03-07 13:45:02 +01:00
SBiOSoftWhare f3d61dda24 MXKRoomBubbleCellData: Add new attributed text message property. 2022-02-09 16:19:49 +01:00
SBiOSoftWhare a1cf7b9b7c Merge pull request #5461 from vector-im/steve/5209_media_bubbles_2 
Message bubbles: Layout for media (part 2)
 2022-02-01 17:52:19 +01:00
SBiOSoftWhare 736b72be55 MXKRoomBubbleCellData: Add convenient isAttachment property. 2022-01-31 10:40:45 +01:00
ismailgulek d71b9ed645 Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-26 14:27:25 +03:00
ismailgulek 6ac01ae245 Merge branch 'develop' into ismail/5068_start_thread 2022-01-25 14:30:52 +03:00
SBiOSoftWhare 8997578680 MXKRoomBubbleCellData: Improve getFirstBubbleComponentWithDisplay and getLastBubbleComponentWithDisplay. 2022-01-20 16:01:45 +01:00
ismailgulek 1f3a8acaeb Add background color management on text message highlights 2022-01-18 16:20:12 +03:00
SBiOSoftWhare 80391fba8c MXKRoomBubbleCellData: Add convenient method. 2022-01-13 16:54:45 +01:00
ismailgulek 061f62251b Apply MatrixKit PR changes 2021-12-09 16:57:43 +03:00
SBiOSoftWhare e7d4cd7707 Merge MatrixKit develop with commit hash: b85b736313bec0592bd1cabc68035d97f5331137 2021-12-03 11:47:24 +01:00