felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-23 10:02:46 +02:00
Code Issues Packages Projects Releases Wiki Activity
33,069 Commits 1 Branch 67 Tags
cc9ba7674ef0d069328480bc55f0299b4fd95682
Commit Graph

33069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
JanNiklas Grabowski b518893214 Merge branch 'feature/5783_change_leave_room_info_last_admin' into 'develop' 
feat: change leave room info last admin (MESSENGER-5783)

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!405
 2024-09-30 12:37:44 +00: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
Frank Rotermund cbd816cb16 Merge branch 'feature/6440_foss_merge_1_18_0' into 'develop' 
chore: FOSS Merge 1.18.0 (MESSENGER-6440)

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!403
 2024-09-30 08:10:23 +00:00
Mauro Romito fc5c303197 fix 2024-09-27 18:06:17 +02:00
Mauro Romito b9e89db813 Libolm removal 2024-09-27 17:09:02 +02:00
JanNiklas Grabowski 44e46be8a0 docs: add comments 2024-09-27 13:33:23 +02:00
JanNiklas Grabowski 7b6693631b feat: change leave room info last admin (MESSENGER-5783) 2024-09-27 13:28:36 +02:00
JanNiklas Grabowski 617d658d99 feat: change leave room info (MESSENGER-6526) 2024-09-27 11:00:03 +02:00
JanNiklas Grabowski ada0c652da feat: add hash (MESSENGER-6522) 2024-09-26 16:29:52 +02:00
Frank Rotermund 1dd6af8673 chore: Remove FLEX and update matrix sdk (MESSENGER-6440) 2024-09-26 14:16:19 +02:00
Frank Rotermund 7d794bef4a chore: Update from FOSS 1.18.0 (MESSENGER-6440) 2024-09-26 07:39:37 +02:00
Mauro 35cd5aec48 Merge pull request #7851 from element-hq/mauroromito/license_update 2024-09-25 13:27:30 +02:00
Mauro Romito 3c2e431c76 update license macro 2024-09-25 12:49:47 +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
Mauro Romito 03ee7c435b Merge branch 'master' into develop 2024-09-17 15:18:09 +02:00
Mauro Romito 6ae191277c Merge branch 'release/1.11.18/master' 2024-09-17 15:18:04 +02:00
Mauro Romito 933883a996 finish version++ 2024-09-17 15:18:04 +02:00
Mauro 6b895fcb38 Merge pull request #7849 from element-hq/release/1.11.18/release 2024-09-17 15:17:51 +02:00
Mauro ff33826229 Update CHANGES.md 2024-09-17 14:32:10 +02:00
Mauro Romito dfd3e80408 version++ 2024-09-17 14:29:08 +02:00
Mauro 18d64d3306 Merge pull request #7848 from element-hq/mauroromito/weblate_release 2024-09-17 13:43:58 +02:00
Mauro Romito 741cfb2c7c Merge branch 'weblate-riot-ios-riot-ios-push' into mauroromito/weblate_release 2024-09-17 12:14:27 +02:00
Mauro Romito e1638490ff Merge branch 'weblate-riot-ios-riot-ios-dialogs' into mauroromito/weblate_release 2024-09-17 12:14:21 +02:00
A1ae17 c04dca4d0f Translated using Weblate (Korean) 
Currently translated at 100.0% (50 of 50 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-push/ko/
 2024-09-16 09:03:58 +00:00
A1ae17 11719f4389 Translated using Weblate (Korean) 
Currently translated at 100.0% (8 of 8 strings)

Translation: Element iOS/Element iOS (Dialogs)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-dialogs/ko/
 2024-09-16 09:03:58 +00:00
A1ae17 3b2611c737 Translated using Weblate (Korean) 
Currently translated at 60.1% (1455 of 2420 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/ko/
 2024-09-16 09:03:57 +00:00
Mauro 6429107d75 Merge pull request #7843 from element-hq/mauroromito/swap_contentscanner_with_crypto_sdk 2024-09-16 11:03:49 +02:00
Mauro Romito ce1f17b635 update podfile.lock 2024-09-16 10:23:18 +02:00