Commit Graph

4117 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
JanNiklas Grabowski 159ff25bd1 Merge branch 'develop' into feature/6526_change_leave_room_info
* develop: (22 commits)
  feat: change leave room info last admin (MESSENGER-5783)
  feat: add hash (MESSENGER-6522)
  chore: Remove FLEX and update matrix sdk (MESSENGER-6440)
  finish version++
  Update CHANGES.md
  version++
  Translated using Weblate (Korean)
  Translated using Weblate (Korean)
  Translated using Weblate (Korean)
  update podfile.lock
  update SDK commit
  fixed some swiftlint errors
  Prepare for new sprint
  finish version++
  version++
  Update the SDK submodule.
  Use the codecov token. (#7834)
  Fix dead image link (#7682)
  Check power level before starting live sharing location (#7832)
  Update FLEX.
  ...

# Conflicts:
#	Riot/Assets/de.lproj/Bwi.strings
#	Riot/Assets/en.lproj/Bwi.strings
2024-09-30 14:54:55 +02:00
JanNiklas Grabowski 44e46be8a0 docs: add comments 2024-09-27 13:33:23 +02:00
JanNiklas Grabowski 617d658d99 feat: change leave room info (MESSENGER-6526) 2024-09-27 11:00:03 +02:00
Frank Rotermund 7d794bef4a chore: Update from FOSS 1.18.0 (MESSENGER-6440) 2024-09-26 07:39:37 +02:00
Mauro Romito 12837d4b89 update license 2024-09-25 12:24:52 +02:00
Mauro Romito 841a694f8a fixed some swiftlint errors 2024-09-13 16:49:38 +02:00
JanNiklas Grabowski 14b13835a8 feat: disable room retention feature (MESSENGER-6076) 2024-08-26 11:38:03 +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 a3a9fc2c66 feat: foss merge changes from review 2024-08-20 12:58:18 +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 eb6eda3000 MESSENGER-6173 fix status events new room 2024-07-02 15:13:24 +02:00
JanNiklas Grabowski 433823a343 MESSENGER-6173 fix room creation status events not showing 2024-06-26 16:32:01 +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
Frank Rotermund c8162a06dd MESSENGER-6142 remove jitsi, sentry, posthog and sublibraries 2024-06-18 14:35:38 +02:00
Mauro Romito 567683445c added functions to listen to
the event and redact the room accordingly
2024-06-14 15:58:00 +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 bec7269db9 MESSENGER-5716 add error message to long press menu 2024-06-06 16:35:04 +02:00
JanNiklas Grabowski 75bc28eb6c MESSENGER-5716 change error message federated invite 2024-06-06 16:05:57 +02:00
Doug 9ae44659c0 Fix a crash when the user taps play multiple times and the download fails. (#7799) 2024-05-30 13:11:19 +01:00
JanNiklas Grabowski 03c79fc8eb MESSENGER-6019 fix permalink bugs 2024-05-28 16:56:48 +02:00
JanNiklas Grabowski d07f1f377b MESSENGER-5791 disable save button if textfield is empty 2024-04-24 09:00:08 +02:00
JanNiklas Grabowski 03cf4e3f35 MESSENGER-5999 fix button color in darkmode 2024-04-15 16:41:04 +02: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 3d5e33b565 Merge branch 'feature/5393_matomo_tracking_for_federation' into 'develop'
Feature/5393 matomo tracking for federation

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!330
2024-03-05 09:50:32 +00:00
Frank Rotermund 52d40ca517 MESSENGER-5393 some tracking fixes 2024-03-05 08:23:02 +01:00
Frank Rotermund 588030542b MESSENGER-5393 matomo ztracking for federation 2024-03-05 07:36:19 +01:00
Arnfried Griesert 1196cee418 MESSENGER-5695 remove borders from avatar photos 2024-03-04 06:57:19 +00: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 95f2332738 Merge branch 'develop' into feature/5365_photos_picker 2024-02-06 10:21:02 +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
JanNiklas Grabowski 37882d5610 Merge branch 'feature/5383_check_alias_old_rooms' into 'develop'
Feature/5383 check alias old rooms

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!304
2024-02-05 12:25:27 +00:00
Frank Rotermund 2dcf1b48ae Merge branch 'feature/5290_fix_clickable_invitation_events' into 'develop'
Feature/5290 fix clickable invitation events

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!309
2024-02-05 12:12:34 +00:00
JanNiklas Grabowski a573e15ea3 MESSENGER-5671 deactivate swpie gesture room participants list 2024-02-02 16:17:09 +01:00
Frank Rotermund af9354320a MESSENGER-5290 fix klickable events part two 2024-02-02 13:57:50 +01:00
Arnfried Griesert d080240b77 Made some changes in video upload for debugging only 2024-02-02 11:04:43 +01:00
Frank Rotermund 9f55da8b53 MESSENGER-5290 fix klickable events 2024-02-02 09:27:58 +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
JanNiklas Grabowski 5f41692969 fix pipeline 2024-01-30 13:54:25 +01:00
JanNiklas Grabowski ba4e145039 MESSENGER-5383 Check alias on acl update 2024-01-30 12:45:05 +01: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