Commit Graph

183 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
JanNiklas Grabowski f1e6b04542 refactoring get federation status 2024-01-25 17:23:17 +01:00
JanNiklas Grabowski 128f24c62a MESSENGER-5226 us12 check if room is personal notes room 2024-01-25 13:19:10 +01:00
JanNiklas Grabowski d5e28c9a12 MESSENGER-5226 us12 federation in timeline header 2024-01-18 14:01:34 +01:00
Arnfried Griesert e5d97ed154 merged element-ios 1.10.5 into 4409_basis_update_1_10_5 2023-03-16 12:19:26 +01:00
Mauro Romito fc1c22c08c refactor completed 2023-03-06 14:59:03 +01:00
Frank Rotermund 226e55caf7 MESSENGER-3304 string in separate files 2022-09-19 11:53:45 +02:00
aringenbach 5691c5669e Setup a dedicated listener owned by PresenceIndicatorView 2022-05-12 10:55:00 +02:00
aringenbach a5fd8f7417 Setup a dedicated listener owned by PresenceIndicatorView 2022-05-12 10:55:00 +02:00
ismailgulek d2d1bfa577 Reduce space between room avatar and name 2022-04-28 03:24:14 +03:00
ismailgulek cb6eb65ca8 Reduce space between room avatar and name 2022-04-28 03:24:14 +03:00
ismailgulek 29515c00b1 Reduce space between the title and room name 2022-04-28 03:16:10 +03:00
ismailgulek 94c606d7b6 Reduce space between the title and room name 2022-04-28 03:16:10 +03:00
aringenbach 08faf850e5 Fix RoomTitleView default presence display & add a constraint for disambiguation on RoomInfoBasicView 2022-04-06 16:01:49 +02:00
aringenbach e21a81366e Fix RoomTitleView default presence display & add a constraint for disambiguation on RoomInfoBasicView 2022-04-06 16:01:49 +02:00
aringenbach 2ab98cfe07 Weakify self on presence notifications observers 2022-04-05 15:21:53 +02:00
aringenbach d492f6764c Weakify self on presence notifications observers 2022-04-05 15:21:53 +02:00
aringenbach 38363b1832 PresenceIndicatorView Swift implementation 2022-04-05 15:13:58 +02:00
aringenbach 10cebea479 PresenceIndicatorView Swift implementation 2022-04-05 15:13:58 +02:00
aringenbach fa3f01bb8f Merge branch 'develop' into aringenbach/5933_presence_indicator 2022-04-05 14:14:45 +02:00
aringenbach ce05f3de08 Merge branch 'develop' into aringenbach/5933_presence_indicator 2022-04-05 14:14:45 +02:00
ismailgulek 4f9d9c2fed Do not scale room name in thread header 2022-04-05 02:34:36 +03:00
ismailgulek a8d6391409 Do not scale room name in thread header 2022-04-05 02:34:36 +03:00
aringenbach 75bd14a878 Slightly reduce RoomTitleView presence indicator border width 2022-04-04 18:52:07 +02:00
aringenbach c5e4481937 Slightly reduce RoomTitleView presence indicator border width 2022-04-04 18:52:07 +02:00
aringenbach 4c38d89f55 Add observer to refresh RoomTitleView on presence updates 2022-04-04 18:52:07 +02:00
aringenbach 7080d8fbd6 Add observer to refresh RoomTitleView on presence updates 2022-04-04 18:52:07 +02:00
aringenbach a3379ea59f Move RoomTitleView encryption badge when presence is displayed 2022-04-04 18:52:07 +02:00
aringenbach 089f2cda9a Move RoomTitleView encryption badge when presence is displayed 2022-04-04 18:52:07 +02:00
aringenbach dbd38d79b2 Enable presence indicator border colour update 2022-04-04 18:52:07 +02:00
aringenbach 0745aa8c89 Enable presence indicator border colour update 2022-04-04 18:52:07 +02:00
aringenbach fec3a9a9c8 Add presence indicator to RoomTitleView 2022-04-04 18:52:07 +02:00
aringenbach 2e91512e14 Add presence indicator to RoomTitleView 2022-04-04 18:52:07 +02:00
Doug 86c2b4ebb5 Remove MatrixKitL10n from SwiftGen
Uses VectorL10n everywhere.
2022-03-03 09:34:54 +00:00
Doug c9cc59d006 Remove MatrixKitL10n from SwiftGen
Uses VectorL10n everywhere.
2022-03-03 09:34:54 +00: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
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
ismailgulek 81543d6de3 Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-27 02:01:55 +03:00
ismailgulek 1574d3d738 Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-27 02:01:55 +03:00
ismailgulek 558b43763f Fix further review remarks 2022-01-27 01:45:01 +03:00
ismailgulek 58b57617c5 Fix further review remarks 2022-01-27 01:45:01 +03:00
ismailgulek d71b9ed645 Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-26 14:27:25 +03:00