Commit Graph

29 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
Arnfried Griesert 6d38c5fe24 MESSENGER-4769 color changes part 2 2023-06-20 11:32:09 +00:00
Gil Eluard efe53ee85e New App Layout: added suppport for room invites in the all chats screen 2022-08-22 13:00:34 +02:00
aringenbach 62dc56df28 Remove exclamation mark badge in invites cell (#5684)
* Remove exclamation mark and improve global design in invites cell

* Revert back to current design, only removing exclamation mark badge

Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-25 10:45:47 +01:00
SBiOSoftWhare e8d4af46d2 Update all Objective-C MatrixKit imports to handle new location. 2021-11-30 16:09:53 +01:00
Philippe Loriaux 216924165d Improve the Obj-C Generated Interface Header Name definition 2021-10-26 17:42:33 +02:00
ismailgulek cc46decec2 Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-30 12:35:46 +03:00
Stefan Ceriu 8b80b3f4c7 vector-im/element-ios/issues/4899 - Replaced (*almost*) all NSLocalizedString calls with newly generated ObjC methods. 2021-09-30 09:40:12 +03:00
ismailgulek 05d71297b5 Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-28 17:30:39 +03:00
ismailgulek 7be98ecf8e Adapt to cell data changes 2021-09-22 11:47:21 +03:00
Doug 9a45b38730 Remove directRoomBorderView from InviteRecentTableViewCell.xib. 2021-08-12 09:50:18 +01:00
Gil Eluard 6d9fdc78fb The Invite cell behaviour is not driven by MXRoom.isDirect property anymore 2021-02-05 10:25:27 +01:00
SBiOSoftWhare 0c192a01f0 InviteRecentTableViewCell: Do not show preview button. 2020-11-26 18:17:02 +01:00
SBiOSoftWhare d15ec15b07 InviteRecentTableViewCell: Use MXRoomSummary.membershipTransitionState to calculate buttons loading state. 2020-11-19 22:38:27 +01:00
SBiOSoftWhare 96609876d2 InviteRecentTableViewCell: Use "accept" as right button only for DM invite and restore "preview" action for room invite. 2020-11-17 22:40:37 +01:00
SBiOSoftWhare 0633594370 Update MXMembershipChangeState related code. 2020-11-17 21:27:57 +01:00
SBiOSoftWhare 7582dbed4a InviteRecentTableViewCell: Add disclosure indicator to indicate preview action. 2020-11-13 17:16:43 +01:00
SBiOSoftWhare 6fdf31edd2 Fix conflict. 2020-11-13 09:47:39 +01:00
manuroe 0a73f23be6 Reskin: Use same color names as in https://app.zeplin.io/project/5c122fa790c5b4241ffa6be7/screen/5c619592daff2f1241d82e75 2019-02-12 19:06:22 +01:00
manuroe b0fc0c9816 reskin: Theme: rename colors as it is in the palette now 2019-01-11 13:13:31 +01:00
manuroe 744a0b8d4f reskin: Create ThemeService.shared 2019-01-11 11:45:27 +01:00
manuroe 712a632120 reskin: Rename RiotDesignValues -> ThemeService 2019-01-11 10:46:00 +01:00
manuroe 2b32e32ac4 reskin: rename ColorValues to Theme 2019-01-10 15:32:59 +01:00
manuroe 6d69bfa167 reskin: ColorValues: suffix UIColor properties names with "Color" 2019-01-10 15:23:22 +01:00
manuroe 674fcfaa9d Reskin: Kill kRiotColorGreen and use RiotDesignValues.colorValues.accent instead 2018-11-30 17:10:28 +01:00
manuroe 58b1ff9381 Reskin: Change the 2 notifications colors 2018-11-30 16:36:34 +01:00
SBiOSoftWhare 26624eafed Fix image references in xib and storyboards by removing .png suffix 2018-07-10 17:16:26 +02:00
SBiOSoftWhare fbe1264a5a Organize views by feature 2018-07-10 10:21:20 +02:00