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

40 Commits

Author SHA1 Message Date
Frank Rotermund
67df1a3e95 chore: FOSS Merge 1.27.11 (MESSENGER-7276) 
Merge commit 'af0b6d4be985d9f26e5111d3fa01389c7321949f' into feature/7276_FOSS_Merge_1_27_11

# Conflicts:
#	Config/AppVersion.xcconfig
#	Gemfile.lock
#	IDETemplateMacros.plist
#	Podfile
#	Podfile.lock
#	README.md
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Room/CellData/RoomBubbleCellData.m
#	Riot/target.yml
#	RiotNSE/NotificationService.swift
#	RiotSwiftUI/Modules/Authentication/ServerSelection/AuthenticationServerSelectionModels.swift
#	RiotSwiftUI/Modules/Authentication/ServerSelection/AuthenticationServerSelectionViewModel.swift
#	RiotSwiftUI/Modules/Authentication/ServerSelection/Coordinator/AuthenticationServerSelectionCoordinator.swift
#	RiotSwiftUI/Modules/Authentication/ServerSelection/View/AuthenticationServerSelectionScreen.swift
#	RiotSwiftUI/Modules/Room/CompletionSuggestion/Service/CompletionSuggestionService.swift
#	fastlane/Fastfile
 2025-05-16 14:06:20 +02:00
Mauro Romito
77bae312d0 added commercial license 2025-01-23 12:19:12 +01: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
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
Arnfried Griesert
c94184f74c MESSENGER-4179 send button wrong color 2023-03-02 14:50:31 +00:00
Alfonso Grillo
9df4a5a10b Inject AvatarViewMode as EnvironmentObject 2023-01-13 12:57:21 +01:00
Stefan Ceriu
1df0be344d Removed deprecated StateStoreViewModel dispatching and reducing 2022-09-27 12:55:44 +03:00
Stefan Ceriu
fc2fdc8ae7 Removed unnecessary comments from RiotSwiftUI templates, fixed StateStoreViewModel typealias formatting 2022-09-27 12:55:44 +03:00
Stefan Ceriu
43c28d23b7 Configured and applied SwiftFormat 2022-09-27 12:55:44 +03:00
Doug
e6ea10f3a6 Prefix test in-front of UI test methods. 2022-07-18 16:06:27 +01:00
Doug
9494c3ca80 Remove iOS 13/14 checks from Template/Onboarding/Authentication. 2022-05-11 09:49:24 +01:00
MaximeE
8e6ae3a667 5720: Remove useless color, fix some issue with AvatarImage border 2022-03-24 11:00:29 +01:00
MaximeE
7f140388a1 5720: Rework some location sharing related view 2022-03-23 15:48:19 +01:00
Doug
2c3abc6a0b Move congratulations strings to Untranslated.strings. 
Update after PR Feedback
 2022-02-28 14:28:09 +00:00
Stefan Ceriu
313b05485a Made StateStoreViewModel state mutable and removed the reducer for all the features using it. 2022-02-02 10:02:12 +02:00
ismailgulek
701d38c798 Merge branch 'develop' into ismail/5068_start_thread 2022-01-19 00:07:52 +03:00
Stefan Ceriu
a9a0bd81c8 vector-im/element-ios/issues/5114 - Cleanup + rename PollTimeline to TimelinePoll. 2022-01-18 20:05:10 +02:00
ismailgulek
a314deb7a1 Merge branch 'develop' into ismail/5068_start_thread 2022-01-17 11:35:10 +03:00
Stefan Ceriu
7161b99d1c vector-im/element-ios/issues/5298 - Various tweaks following code review. 2022-01-04 17:33:32 +02:00
Stefan Ceriu
7826faf6ea vector-im/element-ios/issues/5298 - Added body message content keys and replaced plain string usages. 2022-01-04 17:33:32 +02:00
Stefan Ceriu
9c66b5b7b1 vector-im/element-ios/issues/5298 - Replaced "msgtype" strings with new kMXMessageTypeKey. 2022-01-04 17:33:32 +02:00
ismailgulek
ac1b79ff92 Merge branch 'develop' into ismail/5068_start_thread 2022-01-04 15:28:19 +03:00
Doug
ee74bc16fb Add AnalyticsPrompt to SwiftUI target and replace old UIAlertController. 2021-12-16 17:01:22 +00:00
ismailgulek
3a6e7a19e2 Merge branch 'develop' into ismail/5068_start_thread 2021-12-09 15:25:14 +03:00
Stefan Ceriu
480ad52f60 Merge together SwiftUI template model files and update folder structure. 2021-12-07 16:11:31 +02:00
ismailgulek
4e3667abe0 Adapt to send event api changes 2021-11-04 02:07:09 +03:00
David Langley
70b39f7cec Don't need to take modifiers as parameter to screenGroup. Fix example theming. 2021-09-24 17:21:33 +01:00
David Langley
d560e513d4 Address comments, show unencrypted rooms, 
retain viewModel and services in ScreenSates so you can interact with Previews after the first state.
 2021-09-23 23:57:54 +01:00
David Langley
3bc582c8b5 Only display unencrypted rooms which we can use with the chat view. 2021-09-21 08:06:27 +01:00
David Langley
84eb32a1e7 Fix Unit tests 2021-09-20 15:56:53 +01:00
David Langley
a52604fc56 Cleanup, documentation and ui tests. 2021-09-20 08:47:28 +01:00
David Langley
01f96afe12 Add Flow coordinator and hook up screens. 2021-09-17 10:46:40 +01:00
David Langley
36e4327a76 Improve scrolling behaviour and add name colors 2021-09-16 23:48:59 +01:00
David Langley
cb7b591ff6 Use dynamicMembers for StoreState for single source of truth. Fix bubble grouping and add send message function. 2021-09-16 22:09:32 +01:00
David Langley
62c528ecc0 Merge branch 'langleyd/4781_swiftui_template_examples' of https://github.com/vector-im/element-ios into langleyd/4781_swiftui_template_example2 2021-09-15 17:32:19 +01:00
David Langley
f9e88680e2 Introduce StateStore with bindings example for Chat example. 2021-09-15 11:47:59 +01:00
David Langley
cd1c8a75f3 Add subviews for message and image 2021-09-13 11:39:42 +01:00
David Langley
b51dbb1b63 Add chat example 2021-09-13 11:39:42 +01:00