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

46 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
Arnfried Griesert e5d97ed154 merged element-ios 1.10.5 into 4409_basis_update_1_10_5 2023-03-16 12:19:26 +01:00
Mauro Romito fc1c22c08c refactor completed 2023-03-06 14:59:03 +01:00
Frank Rotermund f9409804b1 Merge commit 'a7b7fffd00663340f1684fa8d096dc20b4c9719e' into feature/basis_update_192 
# Conflicts:
#	Config/AppVersion.xcconfig
#	Config/BuildSettings.swift
#	DesignKit/Source/ColorsSwiftUI.swift
#	DesignKit/Source/FontsSwiftUI.swift
#	DesignKit/Source/ThemeV2.swift
#	DesignKit/Variants/Colors/Dark/DarkColors.swift
#	DesignKit/Variants/Colors/Light/LightColors.swift
#	Podfile.lock
#	Riot/Assets/de.lproj/InfoPlist.strings
#	Riot/Assets/de.lproj/Vector.strings
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Images.swift
#	Riot/Generated/Strings.swift
#	Riot/Managers/PushNotification/PushNotificationService.m
#	Riot/Managers/Settings/RiotSettings.swift
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.h
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Communities/Home/GroupHomeViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/SetPinCode/PinCodePreferences.swift
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/Modules/TabBar/MasterTabBarController.h
#	Riot/Modules/TabBar/MasterTabBarController.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
#	fastlane/Fastfile
#	project.yml
 2022-09-19 14:42:25 +02:00
Frank Rotermund 226e55caf7 MESSENGER-3304 string in separate files 2022-09-19 11:53:45 +02:00
Gil Eluard c1f948dab6 App Layout: added space invites in space bottom sheet 
- UI tweaks
 2022-08-22 13:42:37 +02:00
Gil Eluard 03fc5676bb App Layout: added space invites in space bottom sheet 2022-08-21 11:07:21 +02:00
Gil Eluard a76327da82 Space preview shows wrong number of members (#5934) 
Space preview shows wrong number of members #4842

- Fixed
 2022-03-28 15:35:00 +02:00
Gil Eluard 0fffbe9aee Space preview shows wrong number of members (#5934) 
Space preview shows wrong number of members #4842

- Fixed
 2022-03-28 15:35:00 +02:00
Gil Eluard 583c1636e2 Can't view space invitations from system notifications #5915 
- Fixed
 2022-03-27 23:52:56 +02:00
Gil Eluard ea29d7b591 Can't view space invitations from system notifications #5915 
- Fixed
 2022-03-27 23:52:56 +02:00
Stefan Ceriu 1ab7643de1 Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195. 2022-02-10 08:43:18 +02:00
Stefan Ceriu 4b1eb75fd3 Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195. 2022-02-10 08:43:18 +02:00
Gil Eluard 45368aae7c joining a space seemed to noop 
- Should be fixed
 2022-02-02 17:38:33 +01:00
Gil Eluard 07accfb186 joining a space seemed to noop 
- Should be fixed
 2022-02-02 17:38:33 +01:00
Gil Eluard f3117fbe44 Accepting a Space Invite has shouty button labels #5175 
- fixed
 2022-02-01 16:41:57 +01:00
Gil Eluard ea9911cadd Accepting a Space Invite has shouty button labels #5175 
- fixed
 2022-02-01 16:41:57 +01:00
SBiOSoftWhare aacdf654b3 Update Riot/Modules/Spaces/SpaceDetail/SpaceDetailPresenter.swift 
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
 2021-10-20 18:41:27 +02:00
SBiOSoftWhare 3b1588714d Update Riot/Modules/Spaces/SpaceDetail/SpaceDetailPresenter.swift 
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
 2021-10-20 18:41:27 +02:00
SBiOSoftWhare 2a22d75b2a Merge develop into 4734_room_stack 2021-10-20 11:14:52 +02:00
SBiOSoftWhare 43ef5e3cb0 Merge develop into 4734_room_stack 2021-10-20 11:14:52 +02:00
SBiOSoftWhare 614bd30db8 SpaceDetailPresenter: Fix source view issue on iPad. 2021-10-19 19:33:21 +02:00
SBiOSoftWhare 82c0294d0d SpaceDetailPresenter: Fix source view issue on iPad. 2021-10-19 19:33:21 +02:00
SBiOSoftWhare 2ae4935088 SpaceDetailPresenter: Avoid crash on iPad when the source view is nil. 2021-10-19 14:38:57 +02:00
SBiOSoftWhare 1efe1d268e SpaceDetailPresenter: Avoid crash on iPad when the source view is nil. 2021-10-19 14:38:57 +02:00
Gil Eluard 8fc3632863 [Spaces] M10.4.1 Home space data filtering #4570 
- Added settings menu for Home space
 2021-10-07 15:37:20 +02:00
Gil Eluard f9ae4f8efe [Spaces] M10.4.1 Home space data filtering #4570 
- Added settings menu for Home space
 2021-10-07 15:37:20 +02:00
Gil Eluard 87e2654a01 Fix performance issues with Spaces on very large accounts #4898 
- Support optional `MXSpace.room` property
 2021-10-07 08:48:41 +02:00
Gil Eluard 4cd31be92e Fix performance issues with Spaces on very large accounts #4898 
- Support optional `MXSpace.room` property
 2021-10-07 08:48:41 +02:00
Gil Eluard a04c0f5d8d Fix performance issues with Spaces on very large accounts #4898 
- Support optional `MXSpace.room` property
 2021-10-07 08:46:19 +02:00
Gil Eluard b9b0337985 Fix performance issues with Spaces on very large accounts #4898 
- Support optional `MXSpace.room` property
 2021-10-07 08:46:19 +02:00
Gil Eluard 8fd88b2053 [Spaces] M10.6.1 Handle space link #4498 
- Update after code review
 2021-09-23 17:15:32 +02:00
Gil Eluard 5521802bc2 [Spaces] M10.6.1 Handle space link #4498 
- Update after code review
 2021-09-23 17:15:32 +02:00
Gil Eluard 1403d464ee [Spaces] M10.6.1 Handle space link #4498 
- Fixed universal links
- Added support for space links
 2021-09-22 14:58:19 +02:00
Gil Eluard 3db7e10c15 [Spaces] M10.6.1 Handle space link #4498 
- Fixed universal links
- Added support for space links
 2021-09-22 14:58:19 +02:00
Gil Eluard 9279d17226 Merge branch 'develop' into spaces 
# Conflicts:
#	Riot/Modules/Common/Avatar/AvatarViewDataProtocol.swift
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Home/Views/RoomCollectionViewCell.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
 2021-09-15 14:42:04 +02:00
Gil Eluard 6335acc0cd Merge branch 'develop' into spaces 
# Conflicts:
#	Riot/Modules/Common/Avatar/AvatarViewDataProtocol.swift
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Home/Views/RoomCollectionViewCell.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
 2021-09-15 14:42:04 +02:00
Gil Eluard 7d1d864edb [Spaces] M10.6 Space preview bottom sheet #4497 
- Update after code review
 2021-09-15 11:16:20 +02:00
Gil Eluard e8a2fb924d [Spaces] M10.6 Space preview bottom sheet #4497 
- Update after code review
 2021-09-15 11:16:20 +02:00
Gil Eluard bc0c7f36aa [Spaces] M10.6 Space preview bottom sheet #4497 
- Update after design review
 2021-09-14 09:42:10 +02:00
Gil Eluard 204cccb286 [Spaces] M10.6 Space preview bottom sheet #4497 
- Update after design review
 2021-09-14 09:42:10 +02:00
Gil Eluard 122b414433 [Spaces] M10.6 Space preview bottom sheet #4497 
- Localized strings for space join rule
 2021-09-06 08:47:43 +03:00
Gil Eluard 110ad39c6e [Spaces] M10.6 Space preview bottom sheet #4497 
- Localized strings for space join rule
 2021-09-06 08:47:43 +03:00
Gil Eluard fd5d96aff9 [Spaces] M10.6 Space preview bottom sheet #4497 2021-09-06 07:46:43 +03:00
Gil Eluard 53c3cd7fc6 [Spaces] M10.6 Space preview bottom sheet #4497 2021-09-06 07:46:43 +03:00