Commit Graph

19549 Commits

Author SHA1 Message Date
Element CI 30a924bad5 finish version++ 2023-05-16 16:26:10 +03:00
Stefan Ceriu 20ec994be3 Merge pull request #7549 from vector-im/release/1.10.12/release
Release 1.10.12
2023-05-16 16:24:23 +03:00
Element CI 41bd49f99b version++ 2023-05-16 15:46:02 +03:00
Element CI 8e2761de4e changelog.d: Upgrade MatrixSDK version ([v0.26.10](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.10)). 2023-05-16 15:46:01 +03:00
Frank Rotermund f321e86357 Merge branch 'release/v2.6.0' into develop 2023-05-16 07:39:06 +02:00
Frank Rotermund 8a132896ec Merge branch 'release/v2.6.0' 2023-05-16 07:38:56 +02:00
Frank Rotermund 4ccbe422f3 MESSENGER-4697 use cherry picked sdk 2023-05-15 17:08:56 +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 da50a4312e Merge pull request #7547 from vector-im/aringenbach/disable_removing_trigger_text_in_rte_mode
Disable removing mention/command text trigger with RTE enabled
2023-05-15 08:03:33 +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 0d1e16bae9 MESSENGER-4699 update sdk version 2023-05-11 13:39:05 +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 b56686d337 MESSENGER-4697 set app version to 2.7.0 2023-05-09 09:02:36 +02:00
Frank Rotermund 21eb1854df Merge branch 'feature/4697_release_prep' into 'develop'
MESSENGER-4697 release prep

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!134
2023-05-09 06:50:39 +00:00
Frank Rotermund ea0d90cb86 MESSENGER-4697 release prep 2023-05-09 08:44:20 +02:00
Nicolas Mauri f0c9d85880 Merge pull request #7537 from vector-im/nimau/PSB_268_avatar_disappears
Add logs to track a problem with the top left avatar disappearing
2023-05-05 17:17:58 +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 690aff3e3c Merge branch 'feature/dynamic_textfield_colo' into 'develop'
Recovery key textfield starts now with gray border

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!133
2023-05-05 11:02:24 +00: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
Arnfried Griesert aa3f30c507 Merge branch 'feature/devicemanager_verify_button_color' into develop 2023-05-04 08:43:24 +02:00
Arnfried Griesert 6b173d9dbc Changed font color for device verification button 2023-05-04 06:57:32 +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
aringenbach ee9fd2c186 Add missing self in closure 2023-05-03 17:26:54 +02:00
aringenbach aa71f4be2c Fix composer unit tests 2023-05-03 15:49:58 +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 1b76ba3865 Merge pull request #7533 from vector-im/nimau/7526_marker_overlap_bubble
Fix the position of the marker highlighting an event.
2023-05-03 14:38:31 +02:00
Frank Rotermund f833d63a5d MESSENGER-4454 fix for belated analytics config 2023-05-03 14:34:41 +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
JanNiklas Grabowski 3923844a15 Merge branch 'feature/4494_reset_matomo_id' into 'develop'
MESSENGER-4494 reset matomo instance after logout -> New ID generation

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!132
2023-05-03 11:49:21 +00:00
JanNiklas Grabowski ac990f69ed MESSENGER-4424 refactoring 2023-05-03 12:08:48 +02:00
JanNiklas Grabowski 8215d3feef MESSENGER-4424 fix crash ui changes from background 2023-05-03 12:07:19 +02:00
Nicolas Mauri e4e1d70aeb Add changelog file 2023-05-03 11:49:54 +02:00
Nicolas Mauri 54fcc55d84 Fix: highlighting an event removes the highlighting of the previous event. 2023-05-03 11:43:02 +02:00
Nicolas Mauri 2de0382253 Fix the frame of the marker view highlighting an event 2023-05-03 11:02:02 +02:00
Frank Rotermund 130813807a MESSENGER try other source for cocoapods 2023-05-03 10:57:17 +02:00