Commit Graph

708 Commits

Author SHA1 Message Date
Frank Rotermund 8a54552ffa Feature/5327 releaseprep 2023-11-21 06:33:20 +00:00
JanNiklas Grabowski 5aa841d45f MESSENGER 5236 remove grey green and red shield for room and user avatar 2023-10-27 14:37:22 +02:00
Arnfried Griesert 67f2801417 Merge branch 'master' into feature/5254_merge_element_into_bum
# Conflicts:
#	Config/AppVersion.xcconfig
#	Gemfile
2023-10-22 18:57:22 +02:00
Arnfried Griesert 064ef359aa Merge branch 'develop' into 'feature/5161_basis_update_element'
# Conflicts:
#   Podfile
2023-10-05 12:17:36 +00:00
Alfonso Grillo 273f486ca0 Fix DM crash with RTE enabled 2023-10-03 17:11:32 +02:00
Arnfried Griesert fc3b5e1c1c Merged element 1.11.3 into bum 2023-09-29 05:24:53 +02:00
JanNiklas Grabowski d3b2d59c1c MESSENGER-5160 disable quote function temporary 2023-09-28 12:21:46 +02:00
Doug 2ef93c79b9 Allow the use of Jitsi for 1:1 calls via the client well-known. 2023-09-28 10:01:57 +01:00
Nicolas Mauri 6ce5bcbbfa Fix event forwarding 2023-09-04 17:24:34 +02:00
Frank Rotermund a89785fd0d MESSENGER-4549 Enable locationsharing per default when there is an url in well-known 2023-08-16 08:37:15 +02:00
JanNiklas Grabowski 6dcf4ea8b6 revert '813f9ad6302d421864736a6be596093c23cf35d7' 4889_deactivate_rust_for_prod 2023-07-17 08:54:43 +00:00
Frank Rotermund 54dc0322f0 Merge commit 'b1847a3ae552c52c06ab4934318dbdb2cf1d8c4b' 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
JanNiklas Grabowski 982879c47e Feature/4889 deactivate rust for prod 2023-06-28 05:59:03 +00:00
Frank Rotermund 7c24b01abc Merge branch 'feature/4390_fix_forwarding_for_private_rooms' into 'develop'
MESSENGER-4390 fix message forwarding and disable permalinks for messages in private rooms

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!152
2023-06-26 11:09:37 +00:00
JanNiklas Grabowski f33d85c143 MESSENGER-4795 add matomo event names 2023-06-26 12:19:39 +02:00
JanNiklas Grabowski 26a3639d01 MESSENGER-4390 fix message forwarding and disable permalinks for messages in private rooms 2023-06-22 10:33:41 +02:00
JanNiklas Grabowski 5c7998e240 Feature/4795 feature tracking matomo 2023-06-21 06:24:46 +00:00
JanNiklas Grabowski a52c450bbb MESSENGER-4390 fix private room sharing 2023-06-15 10:21:50 +02:00
aringenbach ff3ef63052 Fix a crash when creating a new direct chat with RTE 2023-06-12 12:20:36 +02:00
Arnfried Griesert 51e98cfe61 merged element 1.10.12 into bum 2023-06-07 15:45:59 +02:00
Nicolas Mauri b56b190442 Prompt the user when the invited MatrixId is not recognized 2023-06-02 14:21:00 +02:00
aringenbach ff61523154 Disable removing mention/command text trigger with RTE enabled 2023-05-12 18:30:20 +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 54fcc55d84 Fix: highlighting an event removes the highlighting of the previous event. 2023-05-03 11:43:02 +02:00
aringenbach aea756c9c2 Update room input toolbar when CompletionSuggestionCoordinator is initialised 2023-05-02 11:44:23 +02:00
aringenbach e1ecdd65ce Fix application crashing when opening a thread with RTE enabled 2023-05-02 11:11:51 +02:00
aringenbach 3d64f80fc6 Fix sending command with Pills through RTE 2023-04-21 17:13:03 +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
aringenbach 0e7d802920 Rename UserSuggestion module as CompletionSuggestion 2023-04-20 16:45:08 +02:00
aringenbach 9c172184bf Add basic slash commands support to UserSuggestion module 2023-04-20 16:45:08 +02:00
Andy Uhnak 4e626f48f1 Deprecate MXLegacyCrypto 2023-04-18 12:45:39 +01:00
Frank Rotermund 74a9c2d612 Merge branch 'develop' of https://dl-gitlab.devopslab.tech/bwmessenger/bundesmessenger/bundesmessenger-ios into develop
# Conflicts:
#	Config/BWIBuildSettings.swift
2023-04-16 19:57:49 +02:00
Frank Rotermund e50392db75 MESSENGER-4535 matomo e2ee error tracking 2023-04-12 16:13:25 +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
Frank Rotermund 1dd82af9c1 Feature/4382 performance send message 2023-03-31 10:31:06 +00:00
Nicolas Mauri 8b6970aa6f Fix comments 2023-03-30 10:31:33 +02:00
Nicolas Mauri b5fb7624fd Fix: read marker update 2023-03-30 10:15:15 +02:00
Nicolas Mauri 694b60b712 Fix: Update the read marker position even if it is not displayed 2023-03-30 10:15:15 +02:00
Doug ce38148c2d Add user suggestions for @room. (#7453) 2023-03-28 14:03:39 +01:00
aringenbach 24a1ce547b Update environment object setup and view model context wrapping to restore SwiftUI UI tests 2023-03-23 17:16:57 +01:00
aringenbach 52594087a2 Display user suggestion list in fullscreen mode with shared context from UserSuggestionCoordinator 2023-03-23 17:16:57 +01:00
aringenbach 3db15471ee Enable user mentions in Rich Text Editor 2023-03-23 17:16:57 +01: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
Arnfried Griesert 8f8741c903 More tint color changes 2023-03-06 22:11:23 +01:00
Nicolas Mauri de2819ae60 Direct Message: manage encrypted DM in case of invite by email
- Don’t allow to invite more than one contact by email
- The DM will be created by enabling the encryption when the HS promotes the encryption
- The chat composer is disabled until a matrix account is created by using the invited email
2023-02-27 18:42:18 +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
Flavio Alescio fae76cf002 indentation 2023-01-31 16:55:59 +01:00