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

25 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
JanNiklas Grabowski 58282bd602 add checks for federated flag for room 2024-01-26 14:17:55 +01:00
JanNiklas Grabowski 30b2ba61bb MESSENGER-5386 change alert appearance 2024-01-25 11:11:45 +01:00
JanNiklas Grabowski 81a6a1cd73 MESSENGER-5386 us17 invite federated users only if room is federated 2024-01-24 16:07:26 +01:00
Frank Rotermund 958727d304 Feature/5327 releaseprep 2023-11-21 06:33:20 +00:00
Frank Rotermund 242e35fdc7 Merge commit 'ab5f501c2daf60d26f41b1a15d7e97bfe5679228' into feature/4884_merge_foss_1.10.14 
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Modules/Home/AllChats/AllChatsCoordinator.swift
#	fastlane/.env.default
#	fastlane/Fastfile
 2023-07-04 08:24:05 +02:00
Nicolas Mauri f3c79973cc Fix: renamed parameter for code clarity 2023-06-06 09:55:33 +02:00
Nicolas Mauri e30901b6d1 Prompt the user when the invited MatrixId is not recognized 2023-06-02 14:21:00 +02: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
Andy Uhnak a9d1e84252 Track all errors in Sentry 2022-08-23 08:14:59 +01:00
Philippe Loriaux 4f4c4134f6 Display the option "Share invite link" only when the room is accessible by link (#6496) 2022-08-18 15:37:00 +02:00
Gil Eluard 437b2eafd6 Invite user UI is always hidden by the keyboard (#6348) 
* Invite user UI is always hidden by the keyboard

- fixed
 2022-07-01 10:32:57 +02:00
Gil Eluard 59038e18c1 Merge branch 'develop' into gil/SP1_space_creation 
# Conflicts:
#	Config/BuildSettings.swift
#	Riot/Generated/Strings.swift
#	Riot/Modules/Home/HomeViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
 2022-03-04 13:38:18 +01:00
Gil Eluard a71f800579 SP1.2: Invite to Space in room landing element-ios#5225 
- Update after review
 2022-02-03 23:44:07 +01:00
Gil Eluard 04e899e72b Update Riot/Modules/Room/ParticipantsInviteModal/ContactsPicker/RoomInviteViewController.swift 
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
 2022-02-03 20:59:44 +01:00
Gil Eluard e0e56b522a Update Riot/Modules/Room/ParticipantsInviteModal/RoomParticipantsInviteModalCoordinatorBridgePresenter.swift 
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
 2022-02-03 20:58:25 +01:00
Gil Eluard aff2cc47aa Update Riot/Modules/Room/ParticipantsInviteModal/ContactsPicker/ContactsPickerViewModel.swift 
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
 2022-02-03 20:56:47 +01:00
Gil Eluard 29e6a86eb4 SP1.2: Invite to Space in room landing element-ios#5225 
- update after design review
 2022-01-27 14:34:03 +01:00
Gil Eluard 7bb7382c22 SP1.2: Invite to Space in room landing element-ios#5225 
- Check user permissions to invite people
 2022-01-26 10:17:42 +01:00
Gil Eluard 150b7b087f Invite to Space in room landing #5225 
- added room option bottom sheet
 2021-12-13 22:16:02 +01:00
Gil Eluard d0a6b2dd11 Implement FAB journeys & rough edge warnings element-ios#5226 
- List of Space members with search
- Invite interactions
- Join room from list
- Implement add room button, with rough edge warning.
 2021-12-10 09:59:10 +01:00
Gil Eluard 13382ac9bd Invite to Space in room landing #5225 
- add share invite link to contacts screen
- Fixed regression
 2021-12-09 16:12:44 +01:00
Gil Eluard c1fa85be6f Invite to Space in room landing #5225 
- Added participant invite coordinator
 2021-12-08 23:21:55 +01:00