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

57 Commits

Author SHA1 Message Date
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
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
Gil Eluard edcf221a59 App Layout: fixed reactions background in timeline 2022-08-25 13:51:50 +02:00
Frank Rotermund c2108a2178 MESSENGER-2762 Initial Merge 2022-03-17 15:51:23 +01:00
Doug 29d7262e38 Fix class keyword deprecation warnings everywhere! 
Using 'class' keyword for protocol inheritance is deprecated; use 'AnyObject' instead
 2021-07-09 17:05:43 +01:00
Doug a4075c89cb Fix class keyword deprecation warnings everywhere! 
Using 'class' keyword for protocol inheritance is deprecated; use 'AnyObject' instead
 2021-07-09 17:05:43 +01:00
SBiOSoftWhare 32efedf8e1 RoomVC: Use accent color for "more emoji" action in context menu. 2020-07-10 14:54:51 +02:00
SBiOSoftWhare e64d9abbc9 RoomVC: Use accent color for "more emoji" action in context menu. 2020-07-10 14:54:51 +02:00
SBiOSoftWhare 373584f27f UIStackView: Refactor extension method vc_removeAllSubviews to vc_removeAllArrangedSubviews. 2019-12-20 10:32:09 +01:00
SBiOSoftWhare 1694031a34 UIStackView: Refactor extension method vc_removeAllSubviews to vc_removeAllArrangedSubviews. 2019-12-20 10:32:09 +01:00
SBiOSoftWhare 993f2fcf54 Reactions menu: Add more reactions button. 2019-07-25 16:58:14 +02:00
SBiOSoftWhare 5fe7b62630 Reactions menu: Add more reactions button. 2019-07-25 16:58:14 +02:00
SBiOSoftWhare 9f5a363f75 RoomVC: Improve RoomContextualMenuPresenter loading speed. 2019-06-27 14:37:17 +02:00
SBiOSoftWhare 945c5a42ac RoomVC: Improve RoomContextualMenuPresenter loading speed. 2019-06-27 14:37:17 +02:00
SBiOSoftWhare fa2ab6c64e RoomContextualMenuViewController: Handle updated ReactionsMenuView and new animations instructions. 2019-06-25 13:48:16 +02:00
SBiOSoftWhare df05577aeb RoomContextualMenuViewController: Handle updated ReactionsMenuView and new animations instructions. 2019-06-25 13:48:16 +02:00
SBiOSoftWhare 1f25a1a60e Update ReactionsMenuView layout. 2019-06-25 13:40:59 +02:00
SBiOSoftWhare 03cf6bef41 Update ReactionsMenuView layout. 2019-06-25 13:40:59 +02:00
SBiOSoftWhare e2b73d9802 Update ReactionsMenuViewModel to handle a list of reactions. 2019-06-25 13:23:07 +02:00
SBiOSoftWhare 86e11131df Update ReactionsMenuViewModel to handle a list of reactions. 2019-06-25 13:23:07 +02:00
SBiOSoftWhare b52b118f74 Update ReactionsMenuButton UI 2019-06-25 12:06:54 +02:00
SBiOSoftWhare 8e2d1d6bc9 Update ReactionsMenuButton UI 2019-06-25 12:06:54 +02:00
manuroe 0e0e2ca0ec Reactions local echoes: Do not show reactions with 0 count (case of reaction being removed) 2019-06-12 18:03:21 +02:00
manuroe 310b39ca1f Reactions local echoes: Do not show reactions with 0 count (case of reaction being removed) 2019-06-12 18:03:21 +02:00
SBiOSoftWhare 90d25879a8 [ReactionsMenuViewModel] Do not perform directly reaction requests and use delegation. 2019-06-06 11:29:28 +02:00
SBiOSoftWhare 72a5f3bc25 [ReactionsMenuViewModel] Do not perform directly reaction requests and use delegation. 2019-06-06 11:29:28 +02:00
manuroe 9ae2703ea6 Reactions menu: Do not notify delegate if reaction requires an unreaction 
Fix Steve's remark
 2019-05-20 20:41:05 +02:00
manuroe b931a0484e Reactions menu: Do not notify delegate if reaction requires an unreaction 
Fix Steve's remark
 2019-05-20 20:41:05 +02:00
manuroe 91d89f0df8 Reactions menu: Do not notify delegate if reaction requires an unreaction 
This avoids to call the delegate twice.
Note: In a short future, we will no more have those 3 state buttons
 2019-05-20 19:48:29 +02:00
manuroe 6f85d8934e Reactions menu: Do not notify delegate if reaction requires an unreaction 
This avoids to call the delegate twice.
Note: In a short future, we will no more have those 3 state buttons
 2019-05-20 19:48:29 +02:00
manuroe c6b97d2797 Reactions: Remove the send reaction hack as it is now done in the SDK 2019-05-20 19:40:52 +02:00
manuroe 6c405109a7 Reactions: Remove the send reaction hack as it is now done in the SDK 2019-05-20 19:40:52 +02:00
manuroe b21a89584b Reactions: Use the hack like on riot-android and riot-web if the server has not yet the aggregations API 
Fix Steve's comment
 2019-05-20 17:00:57 +02:00
manuroe 5af992a2a4 Reactions: Use the hack like on riot-android and riot-web if the server has not yet the aggregations API 
Fix Steve's comment
 2019-05-20 17:00:57 +02:00
manuroe 7f8dc779fe Reactions: Use the hack like on riot-android and riot-web if the server has not yet the aggregations API 2019-05-20 16:04:54 +02:00
manuroe 2824372877 Reactions: Use the hack like on riot-android and riot-web if the server has not yet the aggregations API 2019-05-20 16:04:54 +02:00
manuroe ffbbbe35e9 Reactions: Reactions menu: highlight reactiosn only our user made 2019-05-20 15:00:47 +02:00
manuroe 71e8d104d6 Reactions: Reactions menu: highlight reactiosn only our user made 2019-05-20 15:00:47 +02:00
manuroe b0c6e55120 Reactions: Reactions menu: plug unreact 2019-05-17 17:39:31 +02:00
manuroe 3c512ee7e3 Reactions: Reactions menu: plug unreact 2019-05-17 17:39:31 +02:00
manuroe 7782fde16f Reactions: Follow small SDK change 2019-05-16 17:44:07 +02:00
manuroe cc8862b6f1 Reactions: Follow small SDK change 2019-05-16 17:44:07 +02:00
manuroe 79759d5c24 Reactions: Fix Steve's comments 2019-05-16 16:07:07 +02:00
manuroe 4a965ebf23 Reactions: Fix Steve's comments 2019-05-16 16:07:07 +02:00
manuroe 7fd3afd266 Reactions: we cannot like & dislike at the same time 2019-05-16 14:45:42 +02:00
manuroe 48a3a1ce7b Reactions: we cannot like & dislike at the same time 2019-05-16 14:45:42 +02:00
manuroe d0a071a408 Reactions: notify coordinator for every reaction request steps 
so that it can leave the view when it wants
 2019-05-16 08:07:52 +02:00
manuroe 1da2534834 Reactions: notify coordinator for every reaction request steps 
so that it can leave the view when it wants
 2019-05-16 08:07:52 +02:00
manuroe 5a89ecc7b1 Reactions: Plug button actions 2019-05-16 07:47:23 +02:00