felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-17 15:09:31 +02:00
Code Issues Packages Projects Releases Wiki Activity
33,098 Commits 1 Branch 67 Tags
b84871e93ca9884daa0ebb431e91fc586bc6f1f0
Commit Graph

33098 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JanNiklas Grabowski
b84871e93c Merge branch 'feature/6647_update_readme' into 'develop' 
fix: appstore badge (MESSENGER-6647)

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!418
 2024-12-13 06:21:06 +00:00
JanNiklas Grabowski
c9b020c6a1 Merge branch 'feature/6609_add_publiccode.yml' into 'develop' 
docs: add publiccode.yml (MESSENGER-6609)

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!419
 2024-12-13 06:20:26 +00:00
Jan Niklas Grabowski
57d16b147d docs: add publiccode.yml (MESSENGER-6609) 2024-12-12 16:51:08 +01:00
Jan Niklas Grabowski
fcfd14cc8b fix: appstore badge (MESSENGER-6647) 2024-12-09 13:30:27 +01:00
Jan Niklas Grabowski
a4d99a3006 fix: appstore badge (MESSENGER-6647) 2024-12-09 13:23:24 +01:00
JanNiklas Grabowski
b4a9a43cfc Merge tag 'v2.23.0' into develop 
Changes in BWI project 2.23.0 (2024-11-04)
===================================================

Upstream merge ✨:
- v1.11.19

Features ✨:
- MESSNEGER-6570 show happy birthday popup
- MESSENGER-6595 add hash
- MESSENGER-6542 change appearance of matomo alert

Improvements 🙌:

Bugfix 🐛:
- MESSENGER-6440 security fix - removed unused library OLMKit
- MESSENGER-6687 fix token fetching

Translations 🗣   :

SDK API changes ⚠️:

Build 🧱:

Documentation 📄:
 2024-11-08 14:30:13 +01:00
JanNiklas Grabowski
9ece41a0c5 Merge branch 'release/v2.23.0' v2.23.0 2024-11-08 14:30:12 +01:00
JanNiklas Grabowski
b2a51ee05d Merge branch 'releaseprep/v2.23.0' into 'release/v2.23.0' 
build: update fastlane (MESSENGER-6614)

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!416
 2024-11-08 13:22:12 +00:00
JanNiklas Grabowski
198f738cec build: update fastlane (MESSENGER-6614) 2024-11-08 10:22:42 +01:00
JanNiklas Grabowski
ff82513073 Merge branch 'releaseprep/v2.23.0' into 'release/v2.23.0' 
Releaseprep/v2.23.0

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!415
 2024-11-08 08:30:28 +00:00
JanNiklas Grabowski
ae27ec4f7d Merge branch 'feature/jwt_https' into 'releaseprep/v2.23.0' 
bug: use only https for jwt verify

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!414
 2024-11-05 10:45:46 +00:00
Frank Rotermund
7fc5060842 build: include in nse 2024-11-05 10:57:01 +01:00
Frank Rotermund
1b5d9c8c11 bug: use only https for jwt verify 2024-11-05 10:47:31 +01:00
JanNiklas Grabowski
92896f17d0 chore: Releasenotes (MESSENGER-6614) 2024-11-04 15:05:24 +01:00
JanNiklas Grabowski
9bc04b8a86 chore: Releasenotes (MESSENGER-6614) 2024-11-04 14:37:50 +01:00
JanNiklas Grabowski
7e1d5e3b1b chore: update sdk version tag (MESSENGER-6614) 2024-11-04 14:03:07 +01:00
Frank Rotermund
5011a36510 Merge branch 'feature/6687_jwt_format' into 'develop' 
Feature/6687 jwt format

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!413
 2024-10-31 14:00:29 +00:00
Frank Rotermund
81839ce12b bug: add testservers to internal list again until changes to verify (MESSENGER-6687) 2024-10-31 13:36:37 +01:00
Frank Rotermund
06da68ceef bug: fix token fetching to consider arrays of tokens (MESSENGER-6687) 2024-10-31 13:23:11 +01:00
Frank Rotermund
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
Frank Rotermund
a90b6a4cd5 feat: themeing (MESSENGER-6570) 2024-10-29 07:50:36 +01:00
Frank Rotermund
a499c35e96 feat: show happy birthday (MESSENGER-6570) 2024-10-28 13:57:15 +01:00
JanNiklas Grabowski
f5fe29830a Merge branch 'feature/foss_update_1_11_19' into 'develop' 
Feature/foss update 1 11 19

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!410
 2024-10-25 06:48:02 +00:00
JanNiklas Grabowski
16bf4d29a2 Merge branch 'feature/6595_add_hash' into 'develop' 
feat: add hash (MESSENGER-6595)

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!411
 2024-10-25 06:47:08 +00:00
JanNiklas Grabowski
2040fcc3c1 feat: add hash (MESSENGER-6595) 2024-10-23 17:08:12 +02:00
JanNiklas Grabowski
a1ad592138 chore: update sdk and element base version number (MESSENGER-6656) 2024-10-21 16:27:19 +02:00
JanNiklas Grabowski
5d0ab27a9e chore: remove olm version in settings screen after foss merge (MESSENGER-6656) 2024-10-21 13:43:20 +02:00
JanNiklas Grabowski
9f3d77e9f1 fix: fix build error (MESSENGER-6656) 2024-10-21 13:41:39 +02:00
JanNiklas Grabowski
cc9ba7674e chore: update sdk (MESSENGER-6656) 2024-10-21 13:40:52 +02: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
97c2acf01c Merge branch 'release/1.11.19/master' 2024-10-15 17:27:01 +02:00
Mauro Romito
708a352d8a finish version++ 2024-10-15 17:27:00 +02:00
Mauro
3a48c27bd3 Merge pull request #7855 from element-hq/release/1.11.19/release 
Release 1.11.19
 2024-10-15 17:26:45 +02:00
Mauro Romito
49320ce1ed version++ 2024-10-15 16:53:05 +02:00
Mauro
91a05becc2 Merge pull request #7852 from element-hq/mauroromito/libolm_deprecated_removal 
Libolm removal
 2024-10-15 16:13:35 +02:00
Mauro Romito
f7eac4bd85 comments 2024-10-15 16:13:19 +02:00
Mauro Romito
0f405e42b3 update submodule 2024-10-15 15:36:00 +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
e47b08edb7 Merge branch 'release/v2.22.0' into 'master' 
Release/v2.22.0

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!409
v2.22.0 		2024-10-09 19:57:41 +00:00
Mauro Romito
517ada2d43 remove obsolete tests 2024-10-09 17:14:59 +02:00
Frank Rotermund
9329ad2648 chore: Release SDK Tag (MESSENGER-6559) 2024-10-09 15:00:35 +02:00
Mauro Romito
11f83e66e3 removed unused code 2024-10-09 12:11:48 +02:00
Mauro Romito
a8b3b4cef0 update submodule 2024-10-09 11:53:07 +02:00
Arnfried Griesert
e23bd6e46a Merge branch 'feature/6542_matomo_button_color' into 'develop' 
feat: matomo button color (MESSENGER-6542)

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!407
 2024-10-09 06:38:19 +00:00
Arnfried Griesert
2378429285 feat: matomo button color (MESSENGER-6542) 2024-10-09 06:38:19 +00:00
Frank Rotermund
aeb9b963f9 Merge branch 'feature/6559_version_jump' into 'develop' 
chore: version jump (MESSENGER-6559)

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!406
 2024-10-08 05:23:10 +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
df60fbd855 Merge branch 'feature/6526_change_leave_room_info' into 'develop' 
feat: change leave room info (MESSENGER-6526)

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!404
 2024-09-30 14:50:35 +00: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