felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-21 09:02:44 +02:00
Code Issues Packages Projects Releases Wiki Activity
31,732 Commits 1 Branch 67 Tags
b76b4e080373e204dab9139d8244ab7e1895f9de
Commit Graph

296 Commits

Author SHA1 Message Date
Arnfried Griesert 6068b228a7 Merged element 1.10.9 into bum 2023-04-11 11:46:44 +02:00
Andy Uhnak 28f26de5f6 No event decoration if no decryption result 2023-04-03 17:36:45 +01:00
Andy Uhnak 16f74e84c8 Simplify event encryption decoration 2023-03-27 14:58:10 +01:00
Andy Uhnak ef31ad428b Revert "Merge pull request #7430 from vector-im/andy/user_trust" 
This reverts commit 7f5d3b46eb02a7801d4a7c781762eea3d16ee0e6, reversing
changes made to 5a3adde8f70daec795ac1bee17c5159a155c6106.
 2023-03-22 15:57:25 +00:00
Andy Uhnak db771d2508 Refactor encryption trust level 2023-03-16 14:56:50 +00: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
Flescio 99b8e8de42 fix issue on timeline bubbles not showing proper content after decrypt (#7397) 
* fix issue on timeline bubbles not showing proper content after decrypt

* Update Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSourceManager.m
 2023-03-02 11:30:26 +01:00
JanNiklas Grabowski 1768fb5eee Merge commit 'aaadcc73674cc8886e363693a7d7c08ac9b4f516' into feature/4260_merge_foss_1_10_2 
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile
#	Podfile.lock
#	Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
#	Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift
#	Riot/Modules/Home/AllChats/AllChatsViewController.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
#	Riot/Modules/Room/Settings/RoomSettingsViewController.m
#	fastlane/Fastfile
 2023-02-15 14:56:55 +01:00
Anderas f4fd2cc381 Merge pull request #7369 from vector-im/andy/crypto_fixes 
Do not reset device keys if migrating to CryptoSDK
 2023-02-13 13:01:39 +00:00
Andy Uhnak e535a0112d Do not reset device keys if migrating to CryptoSDK 2023-02-13 11:14:26 +00:00
Doug a46d884b05 Merge branch 'master' into develop 2023-02-10 13:39:22 +00:00
Andy Uhnak d203630795 Fix some crashes 2023-02-09 08:44:31 +00:00
Flescio 9ecfe523aa "Mark as unread" dot appears on rooms that are actually unread, not marked as such (#7352) 
* fix green dot only to appear for marked action
 2023-02-09 09:01:16 +01:00
Alfonso Grillo f6dfd2cc51 Sync with matrix feature branch 2023-02-08 17:29:30 +01:00
Arnfried Griesert 66b2259f7c MESSENGER-4034 app icon name 2023-02-08 14:53:45 +00:00
Alfonso Grillo 475c53b2fa Fix last message for m.poll.end events 2023-02-08 15:30:05 +01:00
Flavio Alescio 7ba73cfc85 Merge branch 'develop' into flescio/7253-Add_mar_kas_unread_option_for_rooms 2023-01-25 10:28:37 +01:00
Alfonso Grillo ce9a982244 Add new localisation for ended poll replies 2023-01-18 16:35:39 +01:00
Frank Rotermund 9f6deb9110 Merge commit '2e9bb7067e9f1596f29b986729822184145906db' into feature/4068_merge_foss_1_9_15 
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Assets/de.lproj/Localizable.strings
#	Riot/Modules/Room/RoomViewController.m
#	RiotNSE/NotificationService.swift
#	fastlane/Fastfile
 2023-01-16 12:11:51 +01:00
Nicolas Mauri 36188fdcf3 Code cleanup 2023-01-13 15:29:51 +01:00
Nicolas Mauri 3aefcd579f Fix how is resent a voice broadcast chunk 2023-01-13 08:33:30 +01:00
Flavio Alescio 8fd6baa3c9 Add mark as unread option for rooms 2023-01-10 16:13:14 +01:00
Alfonso Grillo 8596b36257 Cleanup code 2023-01-10 12:20:34 +01:00
Alfonso Grillo 4bc37ba146 Fix reactions layout 2023-01-10 12:19:39 +01:00
Alfonso Grillo 562f36775d Remove filter for poll.end events 2023-01-10 12:17:15 +01:00
Nicolas Mauri 9845d161a5 Ensures that we only support reactions for a start event 2023-01-09 14:46:26 +01:00
Nicolas Mauri 315bed3fe6 add support for reactions on VB (#7179) 2023-01-06 12:18:19 +01:00
Frank Rotermund 0fca000b8d Merge commit '3d672a05b2a7117ade2e4e87bd2b5762063d7922' into feature/3977_merge_element_1_9_13 
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
#	Riot/Modules/LaunchLoading/LaunchLoadingView.swift
#	Riot/Modules/LaunchLoading/LaunchLoadingView.xib
#	Riot/Modules/MatrixKit/Models/Account/MXKAccount.m
#	Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellData.m
#	Riot/Modules/Room/TimelineCells/Styles/Bubble/BubbleRoomTimelineCellProvider.m
#	Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
#	Riot/Modules/TabBar/MasterTabBarController.m
#	fastlane/Fastfile
 2022-12-19 14:36:30 +01:00
Andy Uhnak 556176606b Fix Sentry errors 2022-12-14 17:25:27 +00:00
Gil Eluard 720d74b428 Merge pull request #7152 from vector-im/gil/7151-Thread_preview_doesnt_update_in_main_timeline 
Thread preview doesn't update in main timeline
 2022-12-09 15:55:59 +01:00
Gil Eluard 79bd2c0ef1 Thread preview doesn't update in main timeline 
- Fixed
 2022-12-09 14:58:07 +01:00
Anderas 073a175388 Merge pull request #7115 from vector-im/andy/mandatory_crypto 
Do not retry initial sync on fatal errors
 2022-12-05 17:48:42 +00:00
Andy Uhnak cb26a5f3f3 Change fatal error range 2022-12-05 16:29:14 +00:00
Philippe Loriaux d6d5cabc0d Remove the voice broadcast chunks from the attachments list 2022-12-02 11:51:33 +01:00
Frank Rotermund cb78e6d70f Feature/3732 pin login in new login flow 2022-11-29 10:56:18 +00:00
Andy Uhnak c28b57ae4a Do not retry initial sync on fatal errors 2022-11-29 10:15:05 +00:00
Frank Rotermund ab8c98183d PSB-196 fix message bubbles by removing timestamps 2022-11-15 15:26:53 +01:00
Anderas 0813bee021 Merge pull request #7068 from vector-im/andy/repeat_sync 
Remove 10s wait on failed initial sync
 2022-11-14 08:39:08 +00:00
Gil Eluard 30c6903570 Threads: removed "unread_thread_notifications" from sync filters for server that doesn't support MSC3773 
- Update after review
 2022-11-10 22:50:26 +01:00
Andy Uhnak 857538e162 Remove 10s wait on failed initial sync 2022-11-10 16:15:16 +00:00
Gil Eluard b0b57ac5e5 Threads: removed "unread_thread_notifications" from sync filters for server that doesn't support MSC3773 2022-11-10 13:22:55 +01:00
Stefan Ceriu 0f16585853 Fixes vector-im/element-ios/issues/6441 - Incorrect timeline item text height calculation 2022-11-08 14:46:44 +02:00
Stefan Ceriu c0ad32079e Revert "Fixes vector-im/element-ios/issues/6441 - Incorrect timeline item text height calculation (#6679)" 
This reverts commit 405c2d8e324c08c1a40e037aeb3c54e93f30bc9f.
 2022-11-08 14:46:44 +02:00
Stefan Ceriu 8a16b00456 Revert "Fix timeline items text height calculation" 
This reverts commit 8f9eddee501702de84192316bd5b2ff9512d681a.
 2022-11-08 14:46:44 +02:00
Stefan Ceriu b2e29aa432 Revert "Replace attributed string height calculation with a more reliable implementation" 
This reverts commit 81773cd1e515cc391c1f21b499f61141cb03c810.
 2022-11-08 14:46:44 +02:00
Gil Eluard 41bff6e310 Merge pull request #7030 from vector-im/gil/7029-Threads_add_support_to_labs_flag_for_read_receipts 
Threads: add support to labs flag for read receipts
 2022-11-04 13:38:59 +01:00
Gil Eluard 95b54ec57c Merge branch 'gil/6663-MSC3771_read_receipts_for_threads' into gil/7029-Threads_add_support_to_labs_flag_for_read_receipts 2022-11-03 13:35:24 +01:00
Gil Eluard ff7203de22 Merge branch 'gil/6663-MSC3771_read_receipts_for_threads' into gil/6664-MSC3773_notifications_for_threads 2022-11-03 13:35:01 +01:00
Gil Eluard 5429fb40b5 Merge branch 'develop' into gil/6663-MSC3771_read_receipts_for_threads 2022-11-03 13:34:27 +01:00