Commit Graph

5508 Commits

Author SHA1 Message Date
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 792420f657 MESSENGER-4882 refactor delete avatar 2023-06-30 16:28:35 +02:00
Frank Rotermund 0645b4971c MESSENGER fix for broad casts 2023-06-30 14:55:04 +02:00
JanNiklas Grabowski f00b1029aa MESSENGER-4819 2023-06-28 13:30:26 +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 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
aringenbach ff3ef63052 Fix a crash when creating a new direct chat with RTE 2023-06-12 12:20:36 +02:00
Arnfried Griesert 4fc5e366e3 Fixed additional merge issues 2023-06-12 06:08:33 +02:00
Nicolas Mauri 0933349877 Fix: Prevents UserAvatarView from disappearing due to incorrect width. 2023-06-07 17:00:08 +02:00
Arnfried Griesert 51e98cfe61 merged element 1.10.12 into bum 2023-06-07 15:45:59 +02:00
Johannes Marbach c4884fb14f Merge pull request #7582 from vector-im/johannes/vm-length 2023-06-07 14:03:17 +02:00
Johannes Marbach 27a8914f65 Increase max. length of voice message recordings to 5m 2023-06-07 09:45:14 +02:00
Stefan Ceriu 8832215022 Merge pull request #7581 from vector-im/stefan/7579
Fix crashes when mentioning users without display names
2023-06-07 10:08:07 +03:00
Stefan Ceriu 2ac97fe1c4 Fix crashes when mentioning users without display names 2023-06-06 19:53:01 +03:00
Nicolas Mauri 054b8327ed Fix: renamed parameter for code clarity 2023-06-06 09:55:33 +02:00
Nicolas Mauri b56b190442 Prompt the user when the invited MatrixId is not recognized 2023-06-02 14:21:00 +02:00
Frank Rotermund 5179eecaa1 Feature/4383 poll participants details 2023-05-31 14:31:07 +00:00
Mauro Romito 63ffafbc40 enabling ff 2023-05-30 16:06:04 +02:00
JanNiklas Grabowski 5370dded66 MESSENGER-1678 add webview navigation policy 2023-05-25 14:32:54 +00:00
mgcm f0edfacb68 RoomCreationIntroCell now conforms to Themable protocol, making this cell type able to be updated when the system changes from light to dark theme and vice-versa 2023-05-23 14:54:10 +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