Commit Graph

1289 Commits

Author SHA1 Message Date
Frank Rotermund 958727d304 Feature/5327 releaseprep 2023-11-21 06:33:20 +00:00
JanNiklas Grabowski 628d420dd9 MESSENGER 5236 remove grey green and red shield for room and user avatar 2023-10-27 14:37:22 +02:00
Arnfried Griesert 54aca03fc4 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 c2d44580e4 Merge branch 'develop' into 'feature/5161_basis_update_element'
# Conflicts:
#   Podfile
2023-10-05 12:17:36 +00:00
Alfonso Grillo 7612d82f8e Fix DM crash with RTE enabled 2023-10-03 17:11:32 +02:00
Arnfried Griesert 3c2c021287 Merged element 1.11.3 into bum 2023-09-29 05:24:53 +02:00
JanNiklas Grabowski 90f0349e2f MESSENGER-5160 disable quote function temporary 2023-09-28 12:21:46 +02:00
Doug 80bed39d2c Allow the use of Jitsi for 1:1 calls via the client well-known. 2023-09-28 10:01:57 +01:00
Nicolas Mauri 48f8ed8593 Fix event forwarding 2023-09-04 17:24:34 +02:00
Frank Rotermund 7568f86a95 MESSENGER-4549 Enable locationsharing per default when there is an url in well-known 2023-08-16 08:37:15 +02:00
JanNiklas Grabowski 485f944c6c revert '5bc3255dfe7b0a56aa3ce4b8056015b438653fed' 4889_deactivate_rust_for_prod 2023-07-17 08:54:43 +00:00
Frank Rotermund 242e35fdc7 Merge commit 'ab5f501c2daf60d26f41b1a15d7e97bfe5679228' 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 a22c234e82 Feature/4889 deactivate rust for prod 2023-06-28 05:59:03 +00:00
Frank Rotermund abd7f01602 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 ab75b9aba0 MESSENGER-4795 add matomo event names 2023-06-26 12:19:39 +02:00
JanNiklas Grabowski 9e381a804f MESSENGER-4390 fix message forwarding and disable permalinks for messages in private rooms 2023-06-22 10:33:41 +02:00
JanNiklas Grabowski 27723fa953 Feature/4795 feature tracking matomo 2023-06-21 06:24:46 +00:00
JanNiklas Grabowski 6bf886499d MESSENGER-4390 fix private room sharing 2023-06-15 10:21:50 +02:00
aringenbach 89696d909c Fix a crash when creating a new direct chat with RTE 2023-06-12 12:20:36 +02:00
Arnfried Griesert 1c0ef0ca52 merged element 1.10.12 into bum 2023-06-07 15:45:59 +02:00
Nicolas Mauri e30901b6d1 Prompt the user when the invited MatrixId is not recognized 2023-06-02 14:21:00 +02:00
aringenbach 401d6a59cf Disable removing mention/command text trigger with RTE enabled 2023-05-12 18:30:20 +02:00
JanNiklas Grabowski 97243bc063 Merge commit '7d18f34a75d1f41cc3bc8b6a36c0ab82ff93f0e4' into feature/4699_basis_update_element
* commit '7d18f34a75d1f41cc3bc8b6a36c0ab82ff93f0e4': (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 3b89cf110c 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 cc4a2cbca2 Fix partial text messages not being saved for each room with RTE enabled 2023-05-03 14:57:36 +02:00
Nicolas Mauri 318a806cfd Fix: highlighting an event removes the highlighting of the previous event. 2023-05-03 11:43:02 +02:00
aringenbach 53ad72dd24 Update room input toolbar when CompletionSuggestionCoordinator is initialised 2023-05-02 11:44:23 +02:00
aringenbach 72013759de Fix application crashing when opening a thread with RTE enabled 2023-05-02 11:11:51 +02:00
aringenbach 3289733957 Fix sending command with Pills through RTE 2023-04-21 17:13:03 +02:00
aringenbach 787967a8e4 Rework MXKSlashCommands to a more Swift-friendly form and use it in suggestion module 2023-04-20 16:45:08 +02:00
aringenbach d28010098a Rename UserSuggestion module as CompletionSuggestion 2023-04-20 16:45:08 +02:00
aringenbach cacf97233a Add basic slash commands support to UserSuggestion module 2023-04-20 16:45:08 +02:00
Andy Uhnak 7b728c14f8 Deprecate MXLegacyCrypto 2023-04-18 12:45:39 +01:00
Frank Rotermund e4d7601165 Merge branch 'develop' of https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios into develop
# Conflicts:
#	Config/BWIBuildSettings.swift
2023-04-16 19:57:49 +02:00
Frank Rotermund 46477d7023 MESSENGER-4535 matomo e2ee error tracking 2023-04-12 16:13:25 +02:00
aringenbach 38ae3cd3a8 Merge branch 'develop' into aringenbach/enable_rte_user_mentions 2023-04-11 14:21:31 +02:00
Arnfried Griesert 6068b228a7 Merged element 1.10.9 into bum 2023-04-11 11:46:44 +02:00
Frank Rotermund 54e8305e5c Feature/4382 performance send message 2023-03-31 10:31:06 +00:00
Nicolas Mauri 5d4158c34d Fix comments 2023-03-30 10:31:33 +02:00
Nicolas Mauri 650ce6d8f3 Fix: read marker update 2023-03-30 10:15:15 +02:00
Nicolas Mauri be6977ca27 Fix: Update the read marker position even if it is not displayed 2023-03-30 10:15:15 +02:00
Doug 669481d907 Add user suggestions for @room. (#7453) 2023-03-28 14:03:39 +01:00
aringenbach 9ea625e470 Update environment object setup and view model context wrapping to restore SwiftUI UI tests 2023-03-23 17:16:57 +01:00
aringenbach 3b9530c065 Display user suggestion list in fullscreen mode with shared context from UserSuggestionCoordinator 2023-03-23 17:16:57 +01:00
aringenbach 935e61e1bb Enable user mentions in Rich Text Editor 2023-03-23 17:16:57 +01: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
Arnfried Griesert d5d299a357 More tint color changes 2023-03-06 22:11:23 +01:00
Nicolas Mauri 71281ce1cc 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 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
Flavio Alescio ae0ba375a2 indentation 2023-01-31 16:55:59 +01:00