Commit Graph

5443 Commits

Author SHA1 Message Date
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 c31a33a33b activate lab setting voice broadcast and enable session manager by default 2023-06-23 10:48:24 +02:00
Frank Rotermund 45cb26e914 MESSENGER-4682 imprint from wellknown (and fix lab feature list) 2023-06-22 09:48:24 +00: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 fe33dcdf04 Merge branch 'feature/4710_manual_verification' into 'develop'
MESSENGER-4710 remove any possibility to self verifiy with old device manager

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!147
2023-06-21 09:36:53 +00:00
Frank Rotermund 43146508af Merge branch 'feature/4795_feature_tracking_matomo' into 'develop'
Feature/4795 feature tracking matomo

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!150
2023-06-21 06:24:46 +00:00
JanNiklas Grabowski 5c7998e240 Feature/4795 feature tracking matomo 2023-06-21 06:24:46 +00:00
JanNiklas Grabowski 0558b35426 Merge branch 'feature/4573_reset_room_filter_on_logout' into 'develop'
MESSENGER-4573 reset room filter on logout

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!148
2023-06-20 13:26:11 +00:00
Frank Rotermund 4b19143d37 Merge branch 'feature/4743_fix_remove_room_avatar' into 'develop'
MESSENGER-4743 fix removing room avatar

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!149
2023-06-20 11:56:21 +00:00
Frank Rotermund 62e840e30b Merge branch 'feature/4742_fix_permalink_info_when_room_not_available' into 'develop'
MESSENGER-4742 fix permalink info when room is not available

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!146
2023-06-20 11:33:37 +00:00
Arnfried Griesert 08b159b675 MESSENGER-4769 color changes part 2 2023-06-20 11:32:09 +00:00
JanNiklas Grabowski 04e333302b MESSENGER-4743 fix removing room avatar 2023-06-20 12:19:28 +02:00
Frank Rotermund 30bc66acf5 MESSENGER-4573 reset room filter on logout 2023-06-20 11:14:01 +02:00
Frank Rotermund 1cb7d01466 MESSENGER-4710 remove any possibility to self verifiy with old device manager 2023-06-19 16:10:12 +02:00
Frank Rotermund 9315e226a0 Merge branch 'feature/4390_fix_private_room_sharing' into 'develop'
MESSENGER-4390 fix private room sharing

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!144
2023-06-19 05:52:11 +00:00
JanNiklas Grabowski 4abaab4061 MESSENGER-4742 fix permalink info when room is not available 2023-06-16 17:01:12 +02:00
JanNiklas Grabowski a52c450bbb MESSENGER-4390 fix private room sharing 2023-06-15 10:21:50 +02:00
Frank Rotermund 1a21b03d6e MESSENGER-3539 prevent logout and error popup when logging out 2023-06-15 07:40:58 +02:00
Frank Rotermund d124da52e6 Merge branch 'feature/4744_remove_black_theme' into 'develop'
MESSENGER-4744 Removed black theme and map already set black theme to dark

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!141
2023-06-14 06:28:28 +00:00
Arnfried Griesert 10ec6686e0 MESSENGER-4744 Removed black theme and map already set black theme to dark 2023-06-14 06:28:28 +00:00
JanNiklas Grabowski 273017eafa Feature/4772 add accessibility declaration 2023-06-14 06:14:17 +00:00
JanNiklas Grabowski 208ad9f3d1 MESSENGER-4736 text changes 2023-06-14 05:54:29 +00:00
Arnfried Griesert 4fc5e366e3 Fixed additional merge issues 2023-06-12 06:08:33 +02:00
Arnfried Griesert 51e98cfe61 merged element 1.10.12 into bum 2023-06-07 15:45:59 +02:00
Frank Rotermund 5179eecaa1 Feature/4383 poll participants details 2023-05-31 14:31:07 +00: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 0d9f089e35 MESSENGER-4697 matomo select right server after relogin 2023-05-15 17:06:58 +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
Nicolas Mauri 5e55b582de Merge pull request #7545 from vector-im/nimau/PSB307_last_event_description_color 2023-05-15 09:03:45 +02:00
aringenbach bea2bcec90 Merge pull request #7546 from vector-im/aringenbach/7322_fix_pills_in_thread_list
Fix mention pills display in thread list
2023-05-15 08:03:42 +02:00
aringenbach 1d15f31ab9 Fix mention pills display in thread list 2023-05-12 18:41:19 +02:00
aringenbach ff61523154 Disable removing mention/command text trigger with RTE enabled 2023-05-12 18:30:20 +02:00
Nicolas Mauri e3b1880f49 Fix: text color of the last event description was incorrect. 2023-05-12 17:15:20 +02:00
Nicolas Mauri 513b9d340a Merge pull request #7541 from vector-im/nimau/PSB349_force_hs_selection
Feat: add a build setting flag to always show the server selection screen in login/registration flow.
2023-05-11 14:57:07 +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
Nicolas Mauri cc1f0eea26 Fix: apply the changes requested in the PR review 2023-05-11 09:45:04 +02:00
Doug e499389998 Fix voiceover order of room creation header and message composer. 2023-05-10 16:15:00 +01:00
Nicolas Mauri 6b0ce2e65a Feat: add a flag in the build settings to force the user to define a homeserver. 2023-05-10 15:46:34 +02:00
Doug 7675da88c4 Use the app's language for accessibility. 2023-05-10 10:15:41 +01:00
Frank Rotermund ea0d90cb86 MESSENGER-4697 release prep 2023-05-09 08:44:20 +02:00
Nicolas Mauri 211cc7e5f1 Add logs to track a problem with the top left avatar disappearing 2023-05-05 17:14:53 +02:00
Arnfried Griesert 87a22916c2 Recovery key textfield starts now with gray border 2023-05-05 12:55:48 +02:00
Nicolas Mauri 1933977544 Merge pull request #7404 from vector-im/nimau/PSB-269-reset-passphrase
Secrets recovery: Fix an issue where the Secrets Reset screen would open twice.
2023-05-05 10:22:46 +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
Frank Rotermund df6278de31 MESSENGER-4646 fix missing matomo button 2023-05-04 08:57:36 +02:00
Nicolas Mauri 62ac4fd401 Merge pull request #7534 from vector-im/nimau/7504_VB_audio_alert_lost_connectivity
VoiceBroadcast: Play a sound to notify the user when VB is pause due to an error.
2023-05-04 08:49:19 +02:00
Frank Rotermund 4b09f6043a MESSENGER-4424 only change button when maintenance changed 2023-05-03 18:01:50 +02:00
Frank Rotermund c986eebece MESSENGER-4454 get serverurls for maintenance and matomo from the right place 2023-05-03 17:29:48 +02:00