Commit Graph

1315 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 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
Frank Rotermund c8162a06dd MESSENGER-6142 remove jitsi, sentry, posthog and sublibraries 2024-06-18 14:35:38 +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 571a1a2d00 MESSENGER-5806 bugfix location view shown after deletion 2024-03-27 16:31:11 +01:00
JanNiklas Grabowski 1175c8c208 Merge branch 'feature/5781_fix_trigger_for_federation_decision_sheet_in_room_preview' into 'develop'
MESSENGER-5781 fix trigger for federation decision sheet in room preview

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!337
2024-03-18 12:59:41 +00:00
Frank Rotermund 528ed55ae3 MESSENGER-5852 Preparation Release 2.16 fix fotopicker 2024-03-15 07:16:57 +01:00
JanNiklas Grabowski d4e3751d03 MESSENGER-5781 fix trigger for federation decision sheet in room preview 2024-03-14 16:39:32 +01:00
Frank Rotermund 2867bae23e MESSENGER-5575 ACL status event handling in the timeline 2024-03-01 07:25:42 +01:00
Frank Rotermund 4aaf86e41e MESSENGER-5570 acl status events up to collapsability 2024-02-21 16:50:20 +01:00
Arnfried Griesert 315e040d93 Delete video files in temp folder when the upload is done or has failed 2024-02-09 09:33:50 +01:00
Arnfried Griesert b4285c367b Run uploadVideo on main thread 2024-02-06 06:17:31 +01:00
Arnfried Griesert 3c08657eb2 Make a copy of a video file before uploading 2024-02-06 05:50:11 +01:00
Arnfried Griesert d080240b77 Made some changes in video upload for debugging only 2024-02-02 11:04:43 +01:00
Arnfried Griesert 0999fd3d7c Merge branch 'develop' into 'feature/5365_photos_picker'
# Conflicts:
#   Config/BWIBuildSettings.swift
2024-01-31 07:41:57 +00:00
Arnfried Griesert a1e169f1f1 Replaced photo and video picker in new composer 2024-01-30 05:29:35 +01:00
JanNiklas Grabowski 58282bd602 add checks for federated flag for room 2024-01-26 14:17:55 +01:00
JanNiklas Grabowski 9e233f696b MESSENGER-5304 refactoring 2024-01-25 14:48:06 +01:00
JanNiklas Grabowski 81abd348be MESSENGER-5304 add condition 2024-01-25 12:58:32 +01:00
JanNiklas Grabowski ff4019f2c4 MESSENGER-5304 refactoring and english translation 2024-01-24 12:04:18 +01:00
JanNiklas Grabowski e4ca351f31 MESSENGER-5304 add room federation decision sheet 2024-01-23 16:11:04 +01:00
Frank Rotermund 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
Nicolas Mauri 88d0362e48 Fix: Remove the “Quote” action from the menu of the selected message. 2023-11-21 14:47:49 +01:00
Frank Rotermund 958727d304 Feature/5327 releaseprep 2023-11-21 06:33:20 +00:00
Mauro Romito 2139790469 fix for dismissing a call when ending a call for everyone 2023-11-06 16:42:38 +01:00
JanNiklas Grabowski 628d420dd9 MESSENGER 5236 remove grey green and red shield for room and user avatar 2023-10-27 14:37:22 +02:00
Arnfried Griesert 54aca03fc4 Merge branch 'master' into feature/5254_merge_element_into_bum
# Conflicts:
#	Config/AppVersion.xcconfig
#	Gemfile
2023-10-22 18:57:22 +02:00
Arnfried Griesert c2d44580e4 Merge branch 'develop' into 'feature/5161_basis_update_element'
# Conflicts:
#   Podfile
2023-10-05 12:17:36 +00:00
Alfonso Grillo 7612d82f8e Fix DM crash with RTE enabled 2023-10-03 17:11:32 +02:00
Arnfried Griesert 3c2c021287 Merged element 1.11.3 into bum 2023-09-29 05:24:53 +02:00
JanNiklas Grabowski 90f0349e2f MESSENGER-5160 disable quote function temporary 2023-09-28 12:21:46 +02:00
Doug 80bed39d2c Allow the use of Jitsi for 1:1 calls via the client well-known. 2023-09-28 10:01:57 +01:00
Nicolas Mauri 48f8ed8593 Fix event forwarding 2023-09-04 17:24:34 +02:00
Frank Rotermund 7568f86a95 MESSENGER-4549 Enable locationsharing per default when there is an url in well-known 2023-08-16 08:37:15 +02: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
Frank Rotermund abd7f01602 Merge branch 'feature/4390_fix_forwarding_for_private_rooms' into 'develop'
MESSENGER-4390 fix message forwarding and disable permalinks for messages in private rooms

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!152
2023-06-26 11:09:37 +00:00
JanNiklas Grabowski ab75b9aba0 MESSENGER-4795 add matomo event names 2023-06-26 12:19:39 +02:00
JanNiklas Grabowski 9e381a804f MESSENGER-4390 fix message forwarding and disable permalinks for messages in private rooms 2023-06-22 10:33:41 +02:00
JanNiklas Grabowski 27723fa953 Feature/4795 feature tracking matomo 2023-06-21 06:24:46 +00:00
JanNiklas Grabowski 6bf886499d MESSENGER-4390 fix private room sharing 2023-06-15 10:21:50 +02:00
aringenbach 89696d909c Fix a crash when creating a new direct chat with RTE 2023-06-12 12:20:36 +02:00
Arnfried Griesert 1c0ef0ca52 merged element 1.10.12 into bum 2023-06-07 15:45:59 +02:00
Nicolas Mauri e30901b6d1 Prompt the user when the invited MatrixId is not recognized 2023-06-02 14:21:00 +02:00
aringenbach 401d6a59cf Disable removing mention/command text trigger with RTE enabled 2023-05-12 18:30:20 +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
aringenbach 3b89cf110c Merge pull request #7536 from vector-im/aringenbach/7535_fix_partial_text_messages
Fix partial text messages not being saved for each room with RTE enabled
2023-05-05 09:29:28 +02:00