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

30 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
Frank Rotermund aeba8c917a MESSENGER-4535 fix invitation into DMs and personal notes and cancelable passphrase flow cherry pick from release 2023-04-12 15:32:51 +02:00
Frank Rotermund 7a15f43f64 Feature/4218 wellknown defaults 2023-02-28 10:07:25 +00:00
Arnfried Griesert 86aa5365bb MESSENGER-3352 build settings 2022-10-27 09:06:24 +00:00
Frank Rotermund 226e55caf7 MESSENGER-3304 string in separate files 2022-09-19 11:53:45 +02:00
Arnfried Griesert 990962285a merged element 1.8.10 2022-05-03 12:48:01 +02:00
Frank Rotermund c2108a2178 MESSENGER-2762 Initial Merge 2022-03-17 15:51:23 +01:00
Arnaud Ringenbach 71eff6c58b Display only available secure backup methods on setup 2022-03-09 11:45:57 +01:00
Arnaud Ringenbach c4489ee711 Display only available secure backup methods on setup 2022-03-09 11:45:57 +01:00
Arnaud Ringenbach 644aac224b Add cancellable property to secureBackup/recovery coordinators 2022-03-09 10:41:48 +01:00
Arnaud Ringenbach 4c5ae7e4da Add cancellable property to secureBackup/recovery coordinators 2022-03-09 10:41:48 +01:00
Arnaud Ringenbach 6c5584acc0 Add cancellable property to secureBackup/recovery view controllers 2022-03-09 10:41:27 +01:00
Arnaud Ringenbach 1c11fc7243 Add cancellable property to secureBackup/recovery view controllers 2022-03-09 10:41:27 +01:00
Stefan Ceriu 95572d5e44 Implements #4693 - Alert users of Element on iOS11 deprecation. 2021-08-25 13:57:32 +03:00
Stefan Ceriu f93ed348c9 Implements #4693 - Alert users of Element on iOS11 deprecation. 2021-08-25 13:57:32 +03:00
Doug 29d7262e38 Fix class keyword deprecation warnings everywhere! 
Using 'class' keyword for protocol inheritance is deprecated; use 'AnyObject' instead
 2021-07-09 17:05:43 +01:00
Doug a4075c89cb Fix class keyword deprecation warnings everywhere! 
Using 'class' keyword for protocol inheritance is deprecated; use 'AnyObject' instead
 2021-07-09 17:05:43 +01:00
SBiOSoftWhare 7e7f5b1c95 SecureBackupSetupIntroViewController: Handle SecureBackupSetupIntroViewModel. 2020-10-13 17:59:13 +02:00
SBiOSoftWhare 93071f1141 SecureBackupSetupIntroViewController: Handle SecureBackupSetupIntroViewModel. 2020-10-13 17:59:13 +02:00
manuroe 6e44ab9ac7 Merge remote-tracking branch 'origin/riot_3361' into riot_3361 2020-06-30 14:32:16 +02:00
manuroe 15e2c0c90d Merge remote-tracking branch 'origin/riot_3361' into riot_3361 2020-06-30 14:32:16 +02:00
manuroe a90ecc82ae Secure backup: Fixed Stève's remarks 2020-06-30 14:32:12 +02:00
manuroe 84c96a4785 Secure backup: Fixed Stève's remarks 2020-06-30 14:32:12 +02:00
manuroe 968b4a05e2 Update Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-30 14:31:22 +02:00
manuroe e8e40f1286 Update Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-06-30 14:31:22 +02:00
manuroe 4e419d870c Secure backup setup: Manage the case when the user has already a key backup 
but we do not have the private key
 2020-06-30 14:15:18 +02:00
manuroe 353d56ac50 Secure backup setup: Manage the case when the user has already a key backup 
but we do not have the private key
 2020-06-30 14:15:18 +02:00
SBiOSoftWhare b044488517 Refactoring secure backup references. 2020-06-26 14:01:33 +02:00
SBiOSoftWhare f353d69c14 Refactoring secure backup references. 2020-06-26 14:01:33 +02:00