Commit Graph

106 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 d07184c687 Merge commit 'ee6e5de4358a2c0a2705194cd954f9207ff772cf' into feature/5854_foss_merge
* commit 'ee6e5de4358a2c0a2705194cd954f9207ff772cf':
  finish version++
  version++
  Fix a bug where QR codes aren't detected if the camera is too close. (#7762)
  element-hq/element-meta/issues/2201 - Disable mark as unread - relates to element-hq/element-meta/issues/891 - relates to element-hq/element-ios/issues/7253
  Fix dictation when using the Rich Text Editor. (#7752)
  Prepare for new sprint
  finish version++
  version++
  changelog.d: Upgrade MatrixSDK version ([v0.27.6](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.6)).
  corrected translations
  Added translation using Weblate (Persian (Old))
  Translated using Weblate (Albanian)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Albanian)
  changelog
  fix
  Prepare for new sprint
  GH actions: remove triaging process and old GH projects

# Conflicts:
#	Config/AppVersion.xcconfig
#	Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift
2024-03-11 12:13:51 +01:00
Stefan Ceriu cd94e1915e element-hq/element-meta/issues/2201 - Disable mark as unread
- relates to element-hq/element-meta/issues/891
- relates to element-hq/element-ios/issues/7253
2024-02-21 15:16:35 +02:00
JanNiklas Grabowski f1e6b04542 refactoring get federation status 2024-01-25 17:23:17 +01:00
JanNiklas Grabowski 8a53e455c7 MESSENGER-5204 fix federation pill appearance 2024-01-12 16:42:03 +01:00
JanNiklas Grabowski edfa89f313 MESSENGER-5203 change image position 2023-11-13 18:13:46 +01:00
JanNiklas Grabowski a213954135 MESSENGER-5203 add federation to lab settings and refactor 2023-11-02 15:35:25 +01:00
JanNiklas Grabowski 5f5aa69a73 MESSENGER-5203 add federation icon to tableview cell 2023-10-31 17:10:22 +01:00
Arnfried Griesert 1c0ef0ca52 merged element 1.10.12 into bum 2023-06-07 15:45:59 +02:00
Nicolas Mauri c843eafe84 Fix: text color of the last event description was incorrect. 2023-05-12 17:15:20 +02:00
JanNiklas Grabowski 1768fb5eee Merge commit 'aaadcc73674cc8886e363693a7d7c08ac9b4f516' into feature/4260_merge_foss_1_10_2
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile
#	Podfile.lock
#	Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
#	Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift
#	Riot/Modules/Home/AllChats/AllChatsViewController.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
#	Riot/Modules/Room/Settings/RoomSettingsViewController.m
#	fastlane/Fastfile
2023-02-15 14:56:55 +01:00
Flescio 9ecfe523aa "Mark as unread" dot appears on rooms that are actually unread, not marked as such (#7352)
* fix green dot only to appear for marked action
2023-02-09 09:01:16 +01:00
Flavio Alescio ceadb84c3d room set manually unread style without notification count 2023-01-25 11:05:54 +01:00
Frank Rotermund 9f6deb9110 Merge commit '2e9bb7067e9f1596f29b986729822184145906db' into feature/4068_merge_foss_1_9_15
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Assets/de.lproj/Localizable.strings
#	Riot/Modules/Room/RoomViewController.m
#	RiotNSE/NotificationService.swift
#	fastlane/Fastfile
2023-01-16 12:11:51 +01:00
Yoan Pintas 79e9f8ee40 Update the room description in the rooms list in case of live broadcast (incoming or outgoing) (#7160) 2022-12-19 19:26:55 +01:00
Arnfried Griesert 86aa5365bb MESSENGER-3352 build settings 2022-10-27 09:06:24 +00:00
Arnfried Griesert d6d4d22541 Patch from notification mentions bugfix in bwm 2022-09-22 16:36:18 +02:00
Arnfried Griesert 92f4cdc8cc Feature/2611 Notifications on mentions 2022-09-22 06:18:25 +00: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
Frank Rotermund 470bda5f15 MESSENGER-2611 color mentions buildfix 2022-09-19 11:59:51 +02:00
Frank Rotermund f2d7b01b60 MESSENGER-2611 color mentions 2022-09-19 11:59:09 +02:00
Gil Eluard 651b304bac Fixed UI glitches in dark mode 2022-09-02 14:23:46 +02:00
Gil Eluard fcc1a8a404 Glitchy room list header when scrolling
- fixed
2022-09-01 16:56:18 +02:00
Gil Eluard 49851694eb App Layout: reintroduced existing Notification left markers on room cells 2022-08-18 17:44:24 +02:00
Gil Eluard 0aa5b4f4a1 Delight edit layout experiment (#6384)
* Delight: Edit layout experiment #6079
* Feature flag new App Layout #6406
* Update All chats screen with latest design #6407
2022-08-02 17:27:33 +02:00
Frank Rotermund ecdd1e3a48 MESSENGER-3310 use local personal note avatar and remove url of old rooms 2022-07-22 16:50:46 +02:00
Frank Rotermund 1ab51f37f8 Merge branch 'master' of https://github.com/vector-im/element-ios into feature/3269_merge_element_1_8_18
# Conflicts:
#	Config/AppIdentifiers.xcconfig
#	Config/AppVersion.xcconfig
#	Podfile
#	Podfile.lock
#	Riot/Assets/de.lproj/Vector.strings
#	Riot/Generated/Images.swift
#	Riot/Modules/Analytics/DecryptionFailureTracker.m
#	Riot/Modules/Application/LegacyAppDelegate.h
#	Riot/Modules/Onboarding/OnboardingCoordinator.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
#	Riot/Modules/Room/RoomViewController.m
#	Riot/SupportingFiles/Info.plist
#	Riot/Utils/EventFormatter.m
#	Riot/Utils/Tools.h
#	Riot/Utils/Tools.m
#	Riot/target.yml
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
#	fastlane/Fastfile
#	project.yml
2022-06-12 19:49:46 +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
aringenbach 648543bc0a Remove observers when needed 2022-05-11 15:51:12 +02:00
aringenbach acec23921d Remove observers when needed 2022-05-11 15:51:12 +02:00
aringenbach ab40964429 Presence: fix live updates on Home & DM list 2022-05-11 15:07:39 +02:00
aringenbach 1c365a3d84 Presence: fix live updates on Home & DM list 2022-05-11 15:07:39 +02:00
Arnfried Griesert 966f5299d9 merged from element 1.8.13 2022-05-05 06:57:45 +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 93ce241a0b Display presence indicator on home & DM list 2022-04-04 18:52:07 +02:00
aringenbach f084689434 Display presence indicator on home & DM list 2022-04-04 18:52:07 +02:00
Arnfried Griesert dc589828b0 feature/1873_unread_messanges_marker 2022-03-29 06:06:22 +00:00
Philippe Loriaux 216924165d Improve the Obj-C Generated Interface Header Name definition 2021-10-26 17:42:33 +02:00
Philippe Loriaux eaa2450be7 Improve the Obj-C Generated Interface Header Name definition 2021-10-26 17:42:33 +02:00
ismailgulek 1eb62fb392 Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-12 11:49:55 +03:00
ismailgulek 32bb4c668a Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-12 11:49:55 +03:00
Doug 7a6deb0c12 Fix generated avatar colours not matching Element Web. 2021-10-11 16:06:15 +01:00
Doug e177f2f03f Fix generated avatar colours not matching Element Web. 2021-10-11 16:06:15 +01:00
ismailgulek d1950906a0 Adapt changes 2021-10-02 02:09:36 +03:00
ismailgulek 5c650c814d Adapt changes 2021-10-02 02:09:36 +03:00
ismailgulek 05d71297b5 Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-28 17:30:39 +03:00
ismailgulek f76f778e0b Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-28 17:30:39 +03:00