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
1a23b84882
replaced deprecated function with the new one to check for power levels
2025-07-22 16:17:48 +02:00
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
77bae312d0
added commercial license
2025-01-23 12:19:12 +01:00
7b3ccbac70
Fix display of incoming call for group calls when receiving VOIP noti… ( #7875 )
...
* Fix display of incoming call for group calls when receiving VOIP notification
Author reset
* Update Riot/Managers/Call/CallPresenter.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com >
---------
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com >
2024-12-04 18:36:28 +00:00
6188657b32
Merge branch 'feature/6570_birthdayscreen' into 'develop'
...
Feature/6570 birthdayscreen
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!412
2024-10-29 09:24:27 +00:00
a499c35e96
feat: show happy birthday (MESSENGER-6570)
2024-10-28 13:57:15 +01:00
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
12837d4b89
update license
2024-09-25 12:24:52 +02:00
eb005301ee
feat: remove changes after merge
2024-08-19 16:20:23 +02:00
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
c8162a06dd
MESSENGER-6142 remove jitsi, sentry, posthog and sublibraries
2024-06-18 14:35:38 +02:00
c1d10f720e
Remove NSFW advanced settings option
2024-06-10 13:35:11 +03:00
ebcb633892
MESSENGER-5706 merge from #5660 and refactoring
2024-03-01 14:06:46 +01:00
d15d8e9f76
MESSENGER-5706 show federation announcement promt
2024-02-22 15:15:29 +01:00
798b611065
MESSENGER-5506 activate
2024-01-30 17:15:32 +01:00
171aa9694e
MESSENGER-5506 show latest profile picture
2024-01-30 16:49:57 +01:00
8a186a37d8
Merge commit 'd786f7bb4f37b77478a8a55df44a6e87247f96c1' into feature/5433_foss_merge
...
* commit 'd786f7bb4f37b77478a8a55df44a6e87247f96c1': (36 commits)
finish version++
Release notes
version++
changelog.d: Upgrade MatrixSDK version ([v0.27.4](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.4 )).
Fix missing placeholder.
Translated using Weblate (Catalan)
Translated using Weblate (Catalan)
Translated using Weblate (Catalan)
Translated using Weblate (Arabic)
Translated using Weblate (Arabic)
Translated using Weblate (Chinese (Simplified))
Translated using Weblate (Vietnamese)
Translated using Weblate (Chinese (Simplified))
Translated using Weblate (Chinese (Simplified))
Fix: Remove the “Quote” action from the menu of the selected message.
Update RTE to 2.18.0 to fix an issue with Speech-to-Text
Code cleanup
Dismiss the keyboard and minimise the composer when pasting an image, a video or a file
Fix: focus, keyboard visibility, composer height
Restore composer tint color
...
# Conflicts:
# Config/AppVersion.xcconfig
# Riot/Modules/Room/RoomViewController.m
2023-12-20 15:11:56 +01:00
cf5dc59acb
safer check
2023-11-07 17:05:32 +01:00
7dbf2a8b60
fix completed
2023-11-07 16:30:13 +01:00
2ef1fe05e7
MESSENGER 4941 add and remove beta features
2023-09-05 17:05:44 +02:00
867a5fea98
MESSENGER-4966 color changes login flow and all chat
2023-08-22 08:35:28 +00:00
fd7c694c8a
MESSENGER-3580 Several bugfixes to notification times
2023-07-17 07:57:49 +00:00
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
b5f628c650
MESSENGER-4744 Removed black theme and map already set black theme to dark
2023-06-14 06:28:28 +00:00
1c0ef0ca52
merged element 1.10.12 into bum
2023-06-07 15:45:59 +02:00
16fa3e6b99
updated protocol signature for jmcallkitlistener
2023-06-07 12:07:12 +03:00
c843eafe84
Fix: text color of the last event description was incorrect.
2023-05-12 17:15:20 +02:00
6068b228a7
Merged element 1.10.9 into bum
2023-04-11 11:46:44 +02:00
7e12e02870
Display upgrade verification prompt
2023-03-27 15:44:44 +01:00
e5d97ed154
merged element-ios 1.10.5 into 4409_basis_update_1_10_5
2023-03-16 12:19:26 +01:00
80c7ac6bf3
MESSENGER-4392 messges bubbles as default
2023-03-10 08:06:43 +01:00
fc1c22c08c
refactor completed
2023-03-06 14:59:03 +01:00
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
66b2259f7c
MESSENGER-4034 app icon name
2023-02-08 14:53:45 +00:00
10d2232d8a
Merge pull request #7335 from vector-im/alfogrillo/automatic_poll_rules_sync
...
Automatic poll rules sync (PSG-1135)
2023-02-03 11:57:53 +01:00
63411b4472
Refactor PushRulesUpdater API
2023-02-03 10:49:59 +01:00
3ab38a63fd
DispatchGroup to TaskGroup refactor
2023-02-02 22:48:48 +01:00
e54050bed2
Refactor unit tests
2023-02-02 19:12:40 +01:00
c06ac1587e
Remove debug prints
2023-02-02 17:01:24 +01:00
eac3f34630
Add UTs
2023-02-02 16:36:50 +01:00
11c3a1d880
Improve NotificationPushRuleType protocol
2023-02-02 15:33:20 +01:00
ddc268b01e
Add NotificationPushRuleType.pushRuleId
2023-02-02 15:18:52 +01:00
168e6067fb
Enable Crypto SDK for production
2023-02-02 12:32:14 +00:00
045d12274d
Cleanup
2023-02-02 12:26:26 +01:00
a3d4a66d1a
Refactor PushRulesUpdater
2023-02-02 12:08:55 +01:00
0de90435fb
Move logic in AppConfiguration
2023-02-02 11:04:28 +01:00
4b25e0edce
Continue PushRulesUpdater logics
2023-02-02 09:58:29 +01:00
b2b2cbac4b
Start PushRulesUpdater
2023-02-01 19:11:00 +01:00
b6cb571d34
Generate crypto store key
2023-01-27 10:20:40 +00:00
Frank Rotermund
Mauro Romito
Viktor Kumanenkov
JanNiklas Grabowski
Stefan Ceriu
Arnfried Griesert
Shunmugaraj
Nicolas Mauri
Andy Uhnak
Alfonso Grillo
Alfonso Grillo