Commit Graph

25 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
JanNiklas Grabowski 0df2b02918 MESSENGER-5223 add federation pill in timeline 2024-01-17 13:51:30 +01:00
Stefan Ceriu 9b849222a2 Fixes vector-im/element-ios/issues/5673 - Implicitly unwrapped optionals on the PlainRoomTimelineCellDecorator. 2022-02-23 14:17:29 +02:00
Stefan Ceriu d8d5c6385b Fixes vector-im/element-ios/issues/5673 - Implicitly unwrapped optionals on the PlainRoomTimelineCellDecorator. 2022-02-23 14:17:29 +02:00
SBiOSoftWhare 68b5b44d61 Merge branch 'develop' into steve/5553_bubbles_text_link
# Conflicts:
#	Riot/Modules/Room/TimelineCells/Common/MXKRoomBubbleTableViewCell.h
2022-02-18 15:16:59 +01:00
SBiOSoftWhare 6978854b2b Merge branch 'develop' into steve/5553_bubbles_text_link
# Conflicts:
#	Riot/Modules/Room/TimelineCells/Common/MXKRoomBubbleTableViewCell.h
2022-02-18 15:16:59 +01:00
SBiOSoftWhare 28ca4f7703 BaseRoomCell: Handle read marker. 2022-02-17 19:23:19 +01:00
SBiOSoftWhare 202cac5d6d BaseRoomCell: Handle read marker. 2022-02-17 19:23:19 +01:00
SBiOSoftWhare eb7edd4245 BaseRoomCell: Fix sender name tap. Prepare avatar view tap. 2022-02-17 09:39:34 +01:00
SBiOSoftWhare d13a6bfb59 BaseRoomCell: Fix sender name tap. Prepare avatar view tap. 2022-02-17 09:39:34 +01:00
SBiOSoftWhare 756b6d4960 BaseRoomCell make some rename. 2022-02-16 10:48:08 +01:00
SBiOSoftWhare fbcc88510a BaseRoomCell make some rename. 2022-02-16 10:48:08 +01:00
SBiOSoftWhare d078e10a7d Rename BubbleCellThreadSummaryDisplayable to RoomCellThreadSummaryDisplayable. 2022-02-16 10:44:11 +01:00
SBiOSoftWhare 2d04a58bd7 Rename BubbleCellThreadSummaryDisplayable to RoomCellThreadSummaryDisplayable. 2022-02-16 10:44:11 +01:00
SBiOSoftWhare 2837acfc0a Rename BubbleCellReadReceiptsDisplayable to RoomCellReadReceiptsDisplayable. 2022-02-16 10:43:21 +01:00
SBiOSoftWhare 24dd1931ca Rename BubbleCellReadReceiptsDisplayable to RoomCellReadReceiptsDisplayable. 2022-02-16 10:43:21 +01:00
SBiOSoftWhare 09520f2de3 Rename BubbleCellReactionsDisplayable to RoomCellReactionsDisplayable. 2022-02-16 10:42:19 +01:00
SBiOSoftWhare cae681fabb Rename BubbleCellReactionsDisplayable to RoomCellReactionsDisplayable. 2022-02-16 10:42:19 +01:00
SBiOSoftWhare 2382ce857d BaseRoomCell: Rename bubbleCellContentView property to roomCellContentView. 2022-02-16 10:40:39 +01:00
SBiOSoftWhare 644217bb23 BaseRoomCell: Rename bubbleCellContentView property to roomCellContentView. 2022-02-16 10:40:39 +01:00
SBiOSoftWhare bc5b05de8e Rename BubbleCellContentView to RoomCellContentView. 2022-02-16 10:11:35 +01:00
SBiOSoftWhare fdd3559e7d Rename BubbleCellContentView to RoomCellContentView. 2022-02-16 10:11:35 +01:00
SBiOSoftWhare f0a09f054a Rename BaseBubbleCell to BaseRoomCell. Rename BaseBubbleCellType to BaseRoomCellProtocol. 2022-02-16 10:09:11 +01:00
SBiOSoftWhare 98a6021216 Rename BaseBubbleCell to BaseRoomCell. Rename BaseBubbleCellType to BaseRoomCellProtocol. 2022-02-16 10:09:11 +01:00