Commit Graph

70 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 f442243546 feat: remove report room function on room info screen (MESSENGEr-6076) 2024-08-21 15:43:27 +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
JanNiklas Grabowski f8618da4c4 MESSENGER-6171 refactoring 2024-06-24 15:12:47 +02:00
JanNiklas Grabowski 330de90df9 MESSENGER-6171 add federation ui for room invite 2024-06-24 14:21:19 +02:00
Stefan Ceriu b691d02a20 Add support for reporting rooms on the room details screen too 2024-06-12 17:55:36 +03:00
Stefan Ceriu 87577f5692 Add support for reporting rooms on the room preview screen 2024-06-12 12:43:36 +03:00
JanNiklas Grabowski 03cf4e3f35 MESSENGER-5999 fix button color in darkmode 2024-04-15 16:41:04 +02:00
Frank Rotermund 226e55caf7 MESSENGER-3304 string in separate files 2022-09-19 11:53:45 +02:00
aringenbach 2f6546799e Add objective C support to SwiftGen assets helpers (#5533)
* Add objective C support to SwiftGen assets helpers

* Use dot notation in ObjC & fix minor issues

Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-10 17:13:23 +01:00
aringenbach 7964d314c8 Add objective C support to SwiftGen assets helpers (#5533)
* Add objective C support to SwiftGen assets helpers

* Use dot notation in ObjC & fix minor issues

Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-10 17:13:23 +01:00
Philippe Loriaux eaa2450be7 Improve the Obj-C Generated Interface Header Name definition 2021-10-26 17:42:33 +02:00
Philippe Loriaux 216924165d Improve the Obj-C Generated Interface Header Name definition 2021-10-26 17:42:33 +02:00
ismailgulek baada9efda Convert number to a string 2021-10-11 22:01:26 +03:00
ismailgulek 4080ab09f5 Convert number to a string 2021-10-11 22:01:26 +03:00
Stefan Ceriu 7b75dec011 vector-im/element-ios/issues/4899 - Replaced (*almost*) all NSLocalizedString calls with newly generated ObjC methods. 2021-09-30 09:40:12 +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
Stefan Ceriu a8b0e8700e Adopt consolidated logging mechanism (#4370)
* Adopted the new MXLog and replaced NSLog throughout the application - vector-im/element-ios/issues/4351
* Replaced NSLog() and print() usages with MXLog.debug()
* Added swiftlint rules for NSLog(), print(), println() and os_log()
* Escape paths used to run script build phases for swiftlint and swiftgen
2021-06-03 11:30:07 +03:00
Stefan Ceriu 43f6c44c78 Adopt consolidated logging mechanism (#4370)
* Adopted the new MXLog and replaced NSLog throughout the application - vector-im/element-ios/issues/4351
* Replaced NSLog() and print() usages with MXLog.debug()
* Added swiftlint rules for NSLog(), print(), println() and os_log()
* Escape paths used to run script build phases for swiftlint and swiftgen
2021-06-03 11:30:07 +03:00
Gil Eluard 7af06bfb48 Show user id in the room invite preview screen 2020-12-21 16:31:02 +01:00
Gil Eluard f1c466e3fe Show user id in the room invite preview screen 2020-12-21 16:31:02 +01:00
ismailgulek d3787e9330 Check user in session before using userId 2020-06-12 15:07:26 +03:00
ismailgulek c9f5ef4f1c Check user in session before using userId 2020-06-12 15:07:26 +03:00
ismailgulek ef946809f1 Get inviter from invite event instead of looping members 2020-06-12 14:36:58 +03:00
ismailgulek c44132199a Get inviter from invite event instead of looping members 2020-06-12 14:36:58 +03:00
manuroe 7f245de855 Reskin: Fix text color in room preview 2019-02-18 10:59:36 +01:00
manuroe 6d5279a4d5 Reskin: Fix text color in room preview 2019-02-18 10:59:36 +01:00
manuroe 2fdb06d879 reskin: Create ThemeService.shared 2019-01-11 11:45:27 +01:00
manuroe 744a0b8d4f reskin: Create ThemeService.shared 2019-01-11 11:45:27 +01:00
manuroe f0c22a14af reskin: Rename RiotDesignValues -> ThemeService 2019-01-11 10:46:00 +01:00
manuroe 712a632120 reskin: Rename RiotDesignValues -> ThemeService 2019-01-11 10:46:00 +01:00
manuroe e755b390c7 reskin: kill kRiotTopicTextColor 2019-01-10 18:08:10 +01:00
manuroe 3cd88a2cb2 reskin: kill kRiotTopicTextColor 2019-01-10 18:08:10 +01:00
manuroe 67044e3451 reskin: kill kRiotSecondaryTextColor 2019-01-10 18:05:21 +01:00
manuroe 936a26da1a reskin: kill kRiotSecondaryTextColor 2019-01-10 18:05:21 +01:00
manuroe 2bdadf5cda reskin: kill kRiotSecondaryBgColor 2019-01-10 17:57:17 +01:00
manuroe 6eeeb2f8d6 reskin: kill kRiotSecondaryBgColor 2019-01-10 17:57:17 +01:00
manuroe 7b40258d05 reskin: remove bar style ivars from RiotDesignValues 2019-01-10 17:08:32 +01:00
manuroe 31a55b3178 reskin: remove bar style ivars from RiotDesignValues 2019-01-10 17:08:32 +01:00
manuroe c702350171 reskin: rename ColorValues to Theme 2019-01-10 15:32:59 +01:00
manuroe 2b32e32ac4 reskin: rename ColorValues to Theme 2019-01-10 15:32:59 +01:00
manuroe 845775d794 reskin: ColorValues: suffix UIColor properties names with "Color" 2019-01-10 15:23:22 +01:00
manuroe 6d69bfa167 reskin: ColorValues: suffix UIColor properties names with "Color" 2019-01-10 15:23:22 +01:00
manuroe cc050e6da0 Reskin: Paint icons with RiotDesignValues.colorValues.accent when possible 2018-12-03 17:14:32 +01:00
manuroe 77c80c84c1 Reskin: Paint icons with RiotDesignValues.colorValues.accent when possible 2018-12-03 17:14:32 +01:00
manuroe 6ad603a6ca Reskin: Kill kRiotColorGreen and use RiotDesignValues.colorValues.accent instead 2018-11-30 17:10:28 +01:00
manuroe 674fcfaa9d Reskin: Kill kRiotColorGreen and use RiotDesignValues.colorValues.accent instead 2018-11-30 17:10:28 +01:00
manuroe 42b089c498 Reskin: Factorise *RoomTitleViews
and apply them kRiotDesignNavigationBarBarTintColor as background color to mimic the nav bar color
2018-11-29 17:47:42 +01:00
manuroe 006dd7237c Reskin: Factorise *RoomTitleViews
and apply them kRiotDesignNavigationBarBarTintColor as background color to mimic the nav bar color
2018-11-29 17:47:42 +01:00