felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-01 05:36:57 +02:00
Code Issues Packages Projects Releases Wiki Activity
19,369 Commits 1 Branch 67 Tags
273017eafa4e26e29c9e16f71bcdfd5ac3751dfd
Commit Graph

501 Commits

Author SHA1 Message Date
Arnfried Griesert 51e98cfe61 merged element 1.10.12 into bum 2023-06-07 15:45:59 +02:00
JanNiklas Grabowski 5370dded66 MESSENGER-1678 add webview navigation policy 2023-05-25 14:32:54 +00:00
JanNiklas Grabowski 7da10c3534 Merge branch 'feature/4699_basis_update_element' into develop 
# Conflicts:
#	Podfile
#	Riot/Modules/MatrixKit/Utils/MXKTools.m
#	Riot/Modules/Pills/PillType.swift
 2023-05-23 14:51:49 +02:00
Frank Rotermund bb659a71e6 MESSENGER-4697 enable SessionManager in Prod, fix peralink pills fix Matomo config bug when login out 2023-05-15 17:06:25 +02:00
JanNiklas Grabowski 674a44b702 Merge commit '98594fd01fc18ee18fde60a45542f1b4d7040c41' into feature/4699_basis_update_element 
* commit '98594fd01fc18ee18fde60a45542f1b4d7040c41': (59 commits)
  finish version++
  Tidy up event formatter issues.
  version++
  changelog.d: Upgrade MatrixSDK version ([v0.26.9](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.9)).
  Translated using Weblate (Russian)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Albanian)
  Translated using Weblate (Hungarian)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (German)
  Translated using Weblate (Slovak)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Indonesian)
  Translated using Weblate (Estonian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Italian)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (German)
  ...

# Conflicts:
#	Config/AppVersion.xcconfig
#	Riot/Utils/EventFormatter.m
#	fastlane/Fastfile
 2023-05-11 13:19:24 +02:00
aringenbach 33eeeebf9d Merge pull request #7536 from vector-im/aringenbach/7535_fix_partial_text_messages 
Fix partial text messages not being saved for each room with RTE enabled
 2023-05-05 09:29:28 +02:00
aringenbach 2eb07ef5e0 Fix partial text messages not being saved for each room with RTE enabled 2023-05-03 14:57:36 +02:00
Nicolas Mauri 2b88e5ce68 VoiceBroadcast: Play a sound to notify the user when VB is pause due to an error. 2023-05-03 14:33:01 +02:00
Nicolas Mauri ecc9f50de0 Fix a flickering issue when the timeline datasource is reloaded. 2023-04-28 16:23:48 +02:00
Nicolas Mauri c9a00433d0 Fix: Remove the matrix id from the notice display name changed event 2023-04-26 09:54:44 +02:00
aringenbach 3d64f80fc6 Fix sending command with Pills through RTE 2023-04-21 17:13:03 +02:00
aringenbach 1cd3b97d7e Fix typo 2023-04-21 13:47:15 +02:00
aringenbach 26b2d0b6d8 Fix comment typo 2023-04-20 17:12:09 +02:00
aringenbach f6646f9059 Rework MXKSlashCommands to a more Swift-friendly form and use it in suggestion module 2023-04-20 16:45:08 +02:00
Nicolas Mauri 23e34f06df Fix: Calculation of the frame for a bubble component 2023-04-20 10:14:51 +02:00
Anderas 2ca6e75534 Merge pull request #7508 from vector-im/andy/deprecate_crypto 
Deprecate MXLegacyCrypto
 2023-04-19 14:14:30 +01:00
Doug c009d11e95 Tidy up event formatter issues. 2023-04-18 17:43:21 +01:00
Andy Uhnak 4e626f48f1 Deprecate MXLegacyCrypto 2023-04-18 12:45:39 +01:00
aringenbach 2cfcec6bf7 Merge branch 'develop' into aringenbach/enable_rte_user_mentions 2023-04-12 15:04:15 +02:00
aringenbach 4519229349 Rename textDefaultFont to defaultFont and remove unnecessary definition in RoomInputToolbarView.h 2023-04-11 14:54:55 +02:00
aringenbach 90217755a9 Merge branch 'develop' into aringenbach/enable_rte_user_mentions 2023-04-11 14:21:31 +02:00
Arnfried Griesert 3736b8c9fd Merged element 1.10.9 into bum 2023-04-11 11:46:44 +02:00
Nicolas Mauri 4ff2662236 Fix: Continue to display pills for matrix.to permalinks if a custom permalinkBaseUrl is set. 2023-04-07 16:40:34 +02:00
Andy Uhnak d55ad2dbea No event decoration if no decryption result 2023-04-03 17:36:45 +01:00
Andy Uhnak 7a01147bd8 Simplify event encryption decoration 2023-03-27 14:58:10 +01:00
aringenbach 0379c977af Use textDefaultFont in all variants of the InputToolbarView 2023-03-23 17:16:57 +01:00
Andy Uhnak e55a733d0c Revert "Merge pull request #7430 from vector-im/andy/user_trust" 
This reverts commit 12ee84f607, reversing
changes made to 3644b647f6.
 2023-03-22 15:57:25 +00:00
Nicolas Mauri e035c1663f Merge pull request #7432 from vector-im/nimau/PSB-59-pills 
Turning permalinks into pills
 2023-03-21 14:36:54 +01:00
Nicolas Mauri 228dee803a Fix: the avatar was incorrect for the pill of a message if the event is not loaded. 2023-03-21 09:27:48 +01:00
Anderas 12ee84f607 Merge pull request #7430 from vector-im/andy/user_trust 
Refactor user / room encryption trust level
 2023-03-20 12:52:46 +00:00
Nicolas Mauri 265516166c Turning permalinks into pills 
#7409: Permalinks to a room/space are pillified
#7411: Permalinks to a matrix user are pillified
#7412: Permalinks to messages are pillified
 2023-03-17 16:58:59 +01:00
Andy Uhnak ddb181ffa0 Refactor encryption trust level 2023-03-16 14:56:50 +00:00
Arnfried Griesert 28852aa790 merged element-ios 1.10.5 into 4409_basis_update_1_10_5 2023-03-16 12:19:26 +01:00
manuroe 120d69edf3 Manage bad m.file attachment format 
https://github.com/vector-im/element-ios/issues/7406

By using value type checker methods.

With this fix, attachments with a wrong size format are still displayed in the timeline. Only the size is omitted
 2023-03-15 15:18:38 +01:00
JanNiklas Grabowski 6344fa6cb6 MESSENGER-4197 fix status messages cut off 2023-03-07 12:14:51 +00:00
Mauro Romito 09daa04dd4 refactor completed 2023-03-06 14:59:03 +01:00
Flescio 725afd6484 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
Frank Rotermund cb100fab66 Merge branch 'release/v.2.3.0' into develop 
# Conflicts:
#	Podfile
 2023-02-16 16:29:24 +01:00
Frank Rotermund 8b0ff57d69 MESSENGER-4258 Fixes from Testprotocol 2023-02-16 15:40:21 +01:00
JanNiklas Grabowski b4d4330109 Merge commit '8b96dce52c015ca629dea38c32307cddbcd2577c' 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 bb0986a59c 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 2bc314e994 Do not reset device keys if migrating to CryptoSDK 2023-02-13 11:14:26 +00:00
Doug 56f2ff19b7 Merge branch 'master' into develop 2023-02-10 13:39:22 +00:00
Andy Uhnak 599e20ea01 Fix some crashes 2023-02-09 08:44:31 +00:00
Flescio 1a33d6976d "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 f47ad395b0 Sync with matrix feature branch 2023-02-08 17:29:30 +01:00
Arnfried Griesert 4264e3b02f MESSENGER-4034 app icon name 2023-02-08 14:53:45 +00:00
Alfonso Grillo a7fec65b33 Fix last message for m.poll.end events 2023-02-08 15:30:05 +01:00
aringenbach 32beb2393c Merge pull request #7317 from vector-im/aringenbach/7316_indentation_support 
Labs: Rich text editor: enable list items indentation
 2023-02-01 09:44:45 +01:00
Anderas 7950518db7 Merge pull request #7323 from vector-im/andy/reset_crypto 
Reset Crypto SDK labs on logout
 2023-01-31 16:35:39 +00:00