Frank Rotermund
|
bf76058997
|
chore: Update to FOSS 1.11.31 (MESSENGER-7610)
Merge commit '822cbc5076da248fa7b997a5e3e906b03c4a09f7' into feature/7610_FOSS_Merge_1_11_31
# Conflicts:
# Config/AppVersion.xcconfig
# Podfile
# Podfile.lock
# README.md
# Riot/Modules/Common/Recents/RecentsViewController.m
# Riot/Modules/ContextMenu/Services/RoomContextActionService.swift
# Riot/Modules/Room/Members/RoomParticipantsViewController.m
# Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
# fastlane/Fastfile
|
2025-08-27 07:39:26 +02:00 |
|
Mauro Romito
|
fc7d72e8d6
|
use mint to run xcodegen 2.39.0
|
2025-07-28 11:00:38 +02:00 |
|
Mauro Romito
|
3e1a9eb3da
|
fixing a test
|
2025-05-29 16:17:08 +02:00 |
|
Frank Rotermund
|
67df1a3e95
|
chore: FOSS Merge 1.27.11 (MESSENGER-7276)
Merge commit 'af0b6d4be985d9f26e5111d3fa01389c7321949f' into feature/7276_FOSS_Merge_1_27_11
# Conflicts:
# Config/AppVersion.xcconfig
# Gemfile.lock
# IDETemplateMacros.plist
# Podfile
# Podfile.lock
# README.md
# Riot/Modules/Authentication/AuthenticationCoordinator.swift
# Riot/Modules/Room/CellData/RoomBubbleCellData.m
# Riot/target.yml
# RiotNSE/NotificationService.swift
# RiotSwiftUI/Modules/Authentication/ServerSelection/AuthenticationServerSelectionModels.swift
# RiotSwiftUI/Modules/Authentication/ServerSelection/AuthenticationServerSelectionViewModel.swift
# RiotSwiftUI/Modules/Authentication/ServerSelection/Coordinator/AuthenticationServerSelectionCoordinator.swift
# RiotSwiftUI/Modules/Authentication/ServerSelection/View/AuthenticationServerSelectionScreen.swift
# RiotSwiftUI/Modules/Room/CompletionSuggestion/Service/CompletionSuggestionService.swift
# fastlane/Fastfile
|
2025-05-16 14:06:20 +02:00 |
|
Hugh Nimmo-Smith
|
f7fc8b807a
|
Support for experimental MSC4286 to not render external payment details
Ref: https://github.com/matrix-org/matrix-spec-proposals/pull/4286
|
2025-05-07 12:36:23 +01:00 |
|
Mauro Romito
|
77bae312d0
|
added commercial license
|
2025-01-23 12:19:12 +01:00 |
|
Doug
|
ee2073a8e3
|
Add sunset banners guiding users to install Element X when registering against a server with MAS. (#7890)
|
2025-01-10 13:22:03 +00:00 |
|
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
|
517ada2d43
|
remove obsolete tests
|
2024-10-09 17:14:59 +02:00 |
|
Mauro Romito
|
fc5c303197
|
fix
|
2024-09-27 18:06:17 +02:00 |
|
Mauro Romito
|
12837d4b89
|
update license
|
2024-09-25 12:24:52 +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 |
|
Valere
|
5c13a0eb76
|
Review: quick format
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
|
2024-06-03 16:10:09 +02:00 |
|
Valere
|
78498be4ce
|
Analytics | Add support for super properties and appPlatform
|
2024-06-01 13:05:04 +02:00 |
|
Valere
|
b9a187c2f5
|
Bump posthog version to 3.25
|
2024-05-31 15:46:47 +02:00 |
|
Stefan Ceriu
|
e991b21310
|
Bump the SDK, fix unit tests
|
2024-05-29 14:34:06 +03:00 |
|
Arnfried Griesert
|
905c6c0951
|
Merged element v1.11.9 into bum
|
2024-04-23 16:13:09 +02:00 |
|
Valere
|
e216c1bbf5
|
Telemetry | Add more properties to posthog utd errors
|
2024-04-05 09:53:07 +02:00 |
|
Valere
|
047be10692
|
Analytics | Report expected UTDs as HistoricalMessage error
|
2024-04-04 13:01:19 +02:00 |
|
Valere
|
e234adf9f9
|
Add more test for convertion to analytics error
|
2024-03-29 18:21:56 +01:00 |
|
Valere
|
d83c01e1dc
|
DecryptionTracker: Permanent vs Temporary UTD
|
2024-03-29 18:14:15 +01:00 |
|
Valere
|
d045a32b74
|
convert DecryptionFailureTracker to swift + tests
|
2024-03-29 11:03:28 +01:00 |
|
Frank Rotermund
|
4e4244eadf
|
Feature/5031 maintenance error handling
|
2023-10-17 10:12:31 +00:00 |
|
Arnfried Griesert
|
3c2c021287
|
Merged element 1.11.3 into bum
|
2023-09-29 05:24:53 +02:00 |
|
Stefan Ceriu
|
0fdaab8b46
|
Add initial support for configuration through MDM
|
2023-09-08 11:59:11 +03:00 |
|
JanNiklas Grabowski
|
485f944c6c
|
revert '5bc3255dfe7b0a56aa3ce4b8056015b438653fed' 4889_deactivate_rust_for_prod
|
2023-07-17 08:54:43 +00:00 |
|
Frank Rotermund
|
242e35fdc7
|
Merge commit 'ab5f501c2daf60d26f41b1a15d7e97bfe5679228' into feature/4884_merge_foss_1.10.14
# Conflicts:
# Config/AppVersion.xcconfig
# Podfile.lock
# Riot/Modules/Home/AllChats/AllChatsCoordinator.swift
# fastlane/.env.default
# fastlane/Fastfile
|
2023-07-04 08:24:05 +02:00 |
|
JanNiklas Grabowski
|
a22c234e82
|
Feature/4889 deactivate rust for prod
|
2023-06-28 05:59:03 +00:00 |
|
Arnfried Griesert
|
1c0ef0ca52
|
merged element 1.10.12 into bum
|
2023-06-07 15:45:59 +02:00 |
|
Alfonso Grillo
|
810a0134e7
|
Fix UTs
|
2023-05-29 16:48:46 +02:00 |
|
JanNiklas Grabowski
|
97243bc063
|
Merge commit '7d18f34a75d1f41cc3bc8b6a36c0ab82ff93f0e4' into feature/4699_basis_update_element
* commit '7d18f34a75d1f41cc3bc8b6a36c0ab82ff93f0e4': (59 commits)
finish version++
Tidy up event formatter issues.
version++
changelog.d: Upgrade MatrixSDK version ([v0.26.9](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.9)).
Translated using Weblate (Russian)
Translated using Weblate (Chinese (Traditional))
Translated using Weblate (Albanian)
Translated using Weblate (Hungarian)
Translated using Weblate (Chinese (Traditional))
Translated using Weblate (Chinese (Traditional))
Translated using Weblate (Chinese (Traditional))
Translated using Weblate (German)
Translated using Weblate (Slovak)
Translated using Weblate (Chinese (Traditional))
Translated using Weblate (Indonesian)
Translated using Weblate (Estonian)
Translated using Weblate (Ukrainian)
Translated using Weblate (Italian)
Translated using Weblate (Chinese (Traditional))
Translated using Weblate (German)
...
# Conflicts:
# Config/AppVersion.xcconfig
# Riot/Utils/EventFormatter.m
# fastlane/Fastfile
|
2023-05-11 13:19:24 +02:00 |
|
Anderas
|
a72830bdd6
|
Merge pull request #7508 from vector-im/andy/deprecate_crypto
Deprecate MXLegacyCrypto
|
2023-04-19 14:14:30 +01:00 |
|
Andy Uhnak
|
e3a32e1c5f
|
Refactor encryption trust level
|
2023-04-19 08:42:11 +01:00 |
|
Andy Uhnak
|
7b728c14f8
|
Deprecate MXLegacyCrypto
|
2023-04-18 12:45:39 +01:00 |
|
aringenbach
|
f79a455262
|
Merge pull request #7416 from vector-im/aringenbach/enable_rte_user_mentions
Enable user mentions in Rich Text Editor
|
2023-04-14 16:19:56 +02:00 |
|
aringenbach
|
46b39e739d
|
Unit tests for insertPills and markdownLinks
|
2023-04-12 14:55:59 +02:00 |
|
Andy Uhnak
|
832ce9f150
|
Enable Rust Crypto for all users
|
2023-04-11 14:49:28 +01:00 |
|
Arnfried Griesert
|
6068b228a7
|
Merged element 1.10.9 into bum
|
2023-04-11 11:46:44 +02:00 |
|
Andy Uhnak
|
ef31ad428b
|
Revert "Merge pull request #7430 from vector-im/andy/user_trust"
This reverts commit 7f5d3b46eb02a7801d4a7c781762eea3d16ee0e6, reversing
changes made to 5a3adde8f70daec795ac1bee17c5159a155c6106.
|
2023-03-22 15:57:25 +00:00 |
|
Nicolas Mauri
|
f3876a7110
|
Merge pull request #7432 from vector-im/nimau/PSB-59-pills
Turning permalinks into pills
|
2023-03-21 14:36:54 +01:00 |
|
Nicolas Mauri
|
3f68748bd5
|
Fix: Unit tests
|
2023-03-21 14:17:52 +01:00 |
|
Andy Uhnak
|
154882b298
|
Fix tests
|
2023-03-21 12:02:53 +00:00 |
|
Nicolas Mauri
|
68918ea21b
|
Fix: Message pill when the room is an alias
|
2023-03-21 10:30:19 +01:00 |
|
Nicolas Mauri
|
cdd144a7e2
|
Fix: Unit tests
|
2023-03-21 09:26:09 +01:00 |
|
Nicolas Mauri
|
18a2360296
|
Turning permalinks into pills
#7409: Permalinks to a room/space are pillified
#7411: Permalinks to a matrix user are pillified
#7412: Permalinks to messages are pillified
|
2023-03-17 16:58:59 +01:00 |
|
Andy Uhnak
|
db771d2508
|
Refactor encryption trust level
|
2023-03-16 14:56:50 +00: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 |
|
Andy Uhnak
|
fabe9566e3
|
Update docs + tests
|
2023-03-02 19:42:09 +00:00 |
|
Andy Uhnak
|
7e41e16467
|
Use SwiftPM AnalyticsEvents
|
2023-03-02 16:59:48 +00:00 |
|
Andy Uhnak
|
674c577003
|
Update tests
|
2023-02-22 11:25:30 +00:00 |
|