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

100 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 d350335c7b Change show poll history button text (patched from BwM) 2023-08-21 14:03:09 +00:00
Arnfried Griesert 44a6360469 Merge branch 'feature/wrong_color_poll_history' into 'develop' 
Color change

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!164
 2023-07-26 11:30:23 +00:00
Arnfried Griesert aa2d6143d5 Color change 2023-07-21 09:34:41 +02:00
Frank Rotermund dc5198f5d9 MESSENGER-4484 poi participants in history 2023-07-18 11:44:35 +00:00
Arnfried Griesert 1c0ef0ca52 merged element 1.10.12 into bum 2023-06-07 15:45:59 +02:00
Frank Rotermund 9bd569dac0 Feature/4383 poll participants details 2023-05-31 14:31:07 +00:00
Frank Rotermund 902b529245 Feature/4393 poll with visible participant p1 2023-05-25 13:52:30 +00:00
Nicolas Mauri 0bc32f0f97 Update RiotSwiftUI/Modules/Room/PollHistory/Service/MatrixSDK/PollHistoryService.swift 
Co-authored-by: Alfonso Grillo <alfogrillo@element.io>
 2023-04-27 14:55:40 +02:00
Nicolas Mauri 1c45459410 Fix: TimelinePoll code refactoring 2023-04-26 17:52:22 +02:00
Nicolas Mauri 5926dad024 Fix: allow to render a TimelinePoll even if the poll is loading 2023-04-26 10:14:44 +02:00
Arnfried Griesert d5d299a357 More tint color changes 2023-03-06 22:11:23 +01:00
Alfonso Grillo 4d245575d5 Improve SegmentedPicker UI 2023-02-06 12:36:31 +01:00
Flavio Alescio 30daef4be1 removed view from viewModel 2023-02-01 12:41:05 +01:00
Flavio Alescio 5946ffb8e2 fix embedding pattern 2023-02-01 11:15:22 +01:00
Flavio Alescio 2f51f66d5e code restyle for poll detail 2023-01-31 16:03:38 +01:00
Flavio Alescio 9d0f5c208b added alert to show possible error, improved tests 2023-01-27 17:10:16 +01:00
Flavio Alescio f0f56c0b69 Merge branch 'develop' into flescio/1040-poll_detail 
# Conflicts:
#	Riot/Generated/Strings.swift
#	RiotSwiftUI/Modules/Room/PollHistory/Coordinator/PollHistoryCoordinator.swift
#	RiotSwiftUI/Modules/Room/PollHistory/PollHistoryModels.swift
#	RiotSwiftUI/Modules/Room/PollHistory/PollHistoryViewModel.swift
 2023-01-27 15:22:15 +01:00
Flavio Alescio 5ea70aacd8 added view in timeline action, added tests 2023-01-27 15:07:32 +01:00
Alfonso Grillo a9f12947d4 Use Calendar to compute target dates 2023-01-26 15:16:48 +01:00
Alfonso Grillo a83075f2f3 Fix alert presentation 2023-01-26 14:52:33 +01:00
Alfonso Grillo 10e10dccb4 Improve tests 2023-01-26 10:29:30 +01:00
Alfonso Grillo 694112e6de Cleanup unused code 2023-01-26 10:14:26 +01:00
Alfonso Grillo f280692d49 Improve error handling 2023-01-26 10:09:47 +01:00
Alfonso Grillo a6aec43601 Refine timestamp logics 2023-01-26 10:09:28 +01:00
Alfonso Grillo a1ae97fa73 Add UTs 2023-01-25 20:16:24 +01:00
Alfonso Grillo 838bdc0629 Add ui tests 2023-01-25 19:58:02 +01:00
Alfonso Grillo 544c505197 Add more MockPollHistoryScreenState cases 2023-01-25 19:41:48 +01:00
Alfonso Grillo bbf7bad5c3 Improve MockPollHistoryScreenState 2023-01-25 19:21:56 +01:00
Alfonso Grillo 7494eb66e5 Add alert on error 2023-01-25 18:40:09 +01:00
Alfonso Grillo c1002c3945 Cleanup code 2023-01-25 18:19:48 +01:00
Alfonso Grillo 2e3aa18f6c Handle live polls 2023-01-25 17:52:39 +01:00
Alfonso Grillo cddf935fa8 Fix pagination reset 2023-01-25 16:23:38 +01:00
Alfonso Grillo 6cd2c04fa4 Remove dynamic poll updates 2023-01-25 16:14:41 +01:00
Alfonso Grillo b2ff25c7cb Restore default constants 2023-01-25 16:06:16 +01:00
Alfonso Grillo 997f706340 Disable load more button if needed 2023-01-25 16:04:47 +01:00
Flavio Alescio a9059d1e9c Merge branch 'develop' into flescio/1040-poll_detail 
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
 2023-01-25 15:49:40 +01:00
Alfonso Grillo 94ca5e3ccc Add live synced days 2023-01-25 15:12:19 +01:00
Alfonso Grillo 1f953c8a93 Disable load more button when there is no content 2023-01-25 12:56:36 +01:00
Alfonso Grillo aafe903e99 Handle number of batches / last batch 2023-01-25 12:35:51 +01:00
Alfonso Grillo ef19527856 Support load more in PollHistoryService 2023-01-25 12:06:04 +01:00
Flavio Alescio 05caf71d5b added view poll in timeline button 2023-01-25 10:27:21 +01:00
Alfonso Grillo 46f4381426 Update tests 2023-01-24 12:25:27 +01:00
Alfonso Grillo 865f2c5245 Refactor next() -> nextBatch() 2023-01-24 10:47:58 +01:00
Alfonso Grillo 7a5a5f4c93 Refactor TimelinePollAnswerOptionButton 2023-01-24 10:42:45 +01:00
Alfonso Grillo 22cca234be Add emptyPollsText in the view model 2023-01-24 09:49:12 +01:00
Alfonso Grillo 024cc528e1 Update RiotSwiftUI/Modules/Room/PollHistory/View/PollHistory.swift 
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
 2023-01-24 09:28:38 +01:00
Alfonso Grillo 3097be5799 Localize load more button 2023-01-24 09:27:20 +01:00
Alfonso Grillo 8d3d0fd5da Rename update poll method 2023-01-24 09:22:57 +01:00