Commit Graph

1061 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
Frank Rotermund 2252384eac Merge branch 'release/v2.22.0' into 'develop'
Release/v2.22.0

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!408
2024-10-09 19:57:51 +00:00
Frank Rotermund f5c430a775 chore: Releasenotes (MESSENGER-6559) 2024-10-08 07:16:06 +02:00
Frank Rotermund 33150a1b26 chore: version jump (MESSENGER-6559) 2024-10-07 14:32:32 +02:00
JanNiklas Grabowski 59931627c7 Merge branch 'feature/6522_add_hash' into 'develop'
feat: add hash (MESSENGER-6522)

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!402
2024-09-30 09:34:20 +00:00
JanNiklas Grabowski ada0c652da feat: add hash (MESSENGER-6522) 2024-09-26 16:29:52 +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 a18bfb56dc Prepare for new sprint 2024-09-17 15:18:11 +02:00
JanNiklas Grabowski acaa3cf145 feat: use match (MESSENGER-6377) 2024-09-05 10:22:25 +00:00
JanNiklas Grabowski 8cc139b57b feat: disable room retention feature (MESSENGER-6076) 2024-08-26 11:02:16 +02:00
Doug b40faaae31 Prepare for new sprint 2024-08-20 16:12:08 +01:00
JanNiklas Grabowski a3a9fc2c66 feat: foss merge changes from review 2024-08-20 12:58:18 +02:00
JanNiklas Grabowski c652fb9089 feat: update element version (MESSENGER-6077) 2024-08-19 16:14:54 +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 f1ecfe2894 Merge tag 'v2.21.0' into develop
Changes in BWI project 2.21.0 (2024-08-09)
===================================================

Upstream merge :

Features :
- MESSENGER-6162 add server selection protection with jwt
- MESSENGER-6273 add hash
- MESSENGER-6236 add hash
- MESSENGER-6229 add hash
- MESSENGER-6372 add hash

Improvements 🙌:

Bugfix 🐛:
- MESSENGER-5896 disable periodic maintenance on logout
- MESSENGER-4172 use fixed sdk version
- MESSENGER-4172 read message marker

Translations 🗣   :

SDK API changes ⚠️:

Build 🧱:
- MESSENGER-6243 change ci runner

Documentation 📄:
- MESSENGER-MESSENGER new license file
2024-08-15 10:48:46 +02:00
JanNiklas Grabowski d62cd1e586 feat: add hash (MESSENGER-6372) 2024-08-14 15:33:41 +02:00
JanNiklas Grabowski 3f3c45a729 feat: update public keys for server selection protection with JWT (MESSENGER-6162) 2024-08-14 14:26:07 +02:00
JanNiklas Grabowski 8da5fbe9dc feat: update public keys for server selection protection with JWT (MESSENGER-6162) 2024-08-14 14:05:53 +02:00
JanNiklas Grabowski 4680101704 MESSENGER-6344 update app version 2024-08-09 14:01:16 +02:00
JanNiklas Grabowski 9bd806c689 feat: add hash (MESSENGER-6273) 2024-07-30 16:13:03 +02:00
Frank Rotermund dc6c9f8fc4 feat: add JWT Support to MDM and refacture (MESSENGER-6162) 2024-07-25 12:51:43 +02:00
Frank Rotermund bb60e8f85d feat: add server selection protection with jwt (MESSENGER-6162) 2024-07-24 15:54:45 +02:00
Mauro Romito d1c02a90d3 Prepare for new sprint 2024-07-23 14:13:11 +02:00
JanNiklas Grabowski 9208feb981 feat: added hashes (MESSENGER-6236) 2024-07-16 15:57:44 +02:00
Frank Rotermund 3914ec3ada Merge branch 'develop' of https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios into develop
* 'develop' of https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios:
  build: version jump (MESSENGER-6204)
2024-07-08 07:21:27 +02:00
Frank Rotermund 0cbfaaabc2 chore: hashes (MESSENGER-6229) 2024-07-05 14:29:21 +02:00
Frank Rotermund 7ea772c598 build: version jump (MESSENGER-6204) 2024-07-04 08:20:09 +02:00
JanNiklas Grabowski ed3e1d96ca MESSENGER-6176 add hash 2024-06-20 15:49:45 +02:00
Mauro Romito b357794162 Prepare for new sprint 2024-06-18 16:54:53 +02:00
Doug 5da2dd3eaf Prepare for new sprint 2024-06-17 12:28:58 +01:00
Stefan Ceriu 71b37368d0 Prepare for new sprint 2024-06-13 08:33:26 +03:00
Stefan Ceriu c1d10f720e Remove NSFW advanced settings option 2024-06-10 13:35:11 +03:00
JanNiklas Grabowski d1aed443de MESSENGER-6139 add hashes 2024-06-06 13:41:38 +02:00
JanNiklas Grabowski 7517c4f6bd MESSENGER-6160 update app version 2024-05-31 13:26:27 +02:00
Doug 36b551a317 Prepare for new sprint 2024-05-30 14:23:21 +01:00
Stefan Ceriu 42f014c521 Prepare for new sprint 2024-05-29 15:17:42 +03:00
Arnfried Griesert 09c673fc2f Resolved merge conflict caused bei another MR 2024-05-16 07:12:07 +02:00
Arnfried Griesert 62fa606c54 Changed build settiings 2024-05-14 06:20:26 +02:00
JanNiklas Grabowski 9561920faf Merge tag 'v2.18.0' into develop
Changes in BWI project 2.18.0 (2024-05-03)
===================================================

Upstream merge :
- v1.11.9

Features :

Improvements 🙌:
- Add save alert for changing users avatar (#5799)
- Change matomo alert text (#5829)

Bugfix 🐛:
- Fixed a crash when trying to add system errors to matrix error list (#5950)
- Fix picture selection for simulators (#5872)
- Fix button font in dark mode (#5999)
- Deactivate save button for functions if no text is provided (#5791)

Translations 🗣   :

SDK API changes ⚠️:

Build 🧱:
- Use XCode 15 for builds (#5948)
- Parallelized builds (#5761)
2024-05-08 15:55:35 +02:00
JanNiklas Grabowski e2ca5c938e MESSENGER-6069 update feature link and add dev information 2024-05-08 11:55:05 +02:00
JanNiklas Grabowski 7772bdd57f MESSENGER-6069 add releasenotes 2024-05-03 16:17:06 +02:00
JanNiklas Grabowski 704840b6c1 MESSENGER-6069 update app version 2024-05-02 15:29:47 +02:00
Doug b06cbaef60 Prepare for new sprint 2024-05-01 12:00:14 +01:00
Arnfried Griesert ee75d5d55d Set app version to 2.18.0 2024-04-15 14:34:42 +02:00
Arnfried Griesert 952312242c Changed build settings 2024-04-09 12:36:32 +02:00
Arnfried Griesert 8c97d67697 Merge branch 'feature/5458_new_feature_banner' into 'develop'
MESSENGER-5458 new feature banner

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!340
2024-04-03 10:21:23 +00:00
Arnfried Griesert e9c0d7ff2c Merge branch 'feature/5145_simplified_login' into 'develop'
MESSENGER-5145 simplified login

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!339
2024-04-03 10:21:07 +00:00
Mauro Romito c6761c8b43 Prepare for new sprint 2024-04-02 15:06:28 +02:00
JanNiklas Grabowski 6de4679041 MESSENGER-5892 activate federation with wellknown 2024-03-28 16:47:09 +01:00