Commit Graph

19523 Commits

Author SHA1 Message Date
Arnfried Griesert 77ded301ac Merge branch 'feature/3580_additional_notification_times_bugfixes' into 'develop'
MESSENGER-3580 Several bugfixes to notification times

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!161
2023-07-17 07:57:49 +00:00
Arnfried Griesert 8f4f052303 MESSENGER-3580 Several bugfixes to notification times 2023-07-17 07:57:49 +00:00
Frank Rotermund a85f065dcd Merge branch 'feature/3580_test_ruhezeiten' into 'develop'
Enable notification filtering

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!158
2023-07-13 06:36:37 +00:00
Arnfried Griesert f645005368 Enable notification filtering 2023-07-12 15:18:16 +02:00
JanNiklas Grabowski 069209f952 merge branch 'release/v2.7.0' into develop 2023-07-11 18:41:08 +02:00
JanNiklas Grabowski 276fda6cb0 Merge branch 'release/v2.7.0' 2023-07-11 18:33:04 +02:00
JanNiklas Grabowski 0a215f376e MESSENGER-4883 fix update room avatar v2.7.0-rc06 2023-07-10 18:12:31 +02:00
JanNiklas Grabowski cd5cf18b6c MESSENGER-4883 add color changes and manual app store upload for beta 2023-07-10 17:08:37 +02:00
JanNiklas Grabowski 95452b58ab MESSENGER-4819 change icon v2.7.0-rc05 2023-07-10 12:36:40 +02:00
JanNiklas Grabowski 9a931d7734 change color on allchatsvc v2.7.0-rc04 2023-07-05 16:56:35 +02:00
JanNiklas Grabowski cc3f55e0e2 MESSENGER-4882 changelog and fixes v2.7.0-rc03 2023-07-04 15:16:20 +02:00
Frank Rotermund 18a516db3b MESSENGER-4884 update build files 2023-07-04 08:24:45 +02: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 4b436752af MESSENGER-4929 show participant votes button when user has voted v2.7.0-RC01 v2.7.0-rc02 2023-07-03 15:27:36 +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 a40c9ee4ae Update Appversion at sprint start 2023-06-29 18:16:38 +02:00
JanNiklas Grabowski 9cada37bb3 MESSENGER-4772 change font size 2023-06-29 12:18:10 +02:00
Frank Rotermund ea7a318864 Merge branch 'feature/4819_fix_logo_when_app_moved_to_background' into 'develop'
MESSENGER-4819

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!157
2023-06-28 12:15:49 +00:00
JanNiklas Grabowski f00b1029aa MESSENGER-4819 2023-06-28 13:30:26 +02:00
Frank Rotermund 813f9ad630 Merge branch 'feature/4889_deactivate_rust_for_prod' into 'develop'
Feature/4889 deactivate rust for prod

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!156
2023-06-28 05:59:03 +00:00
JanNiklas Grabowski 982879c47e Feature/4889 deactivate rust for prod 2023-06-28 05:59:03 +00:00
Frank Rotermund 5da280a961 Merge branch 'feature/4753_bum_test_app' into 'develop'
Feature/4753 bum test app

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!155
2023-06-26 12:22:45 +00:00
JanNiklas Grabowski 56da60de83 Feature/4753 bum test app 2023-06-26 12:22:44 +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
Frank Rotermund 506bc9b8d2 Merge branch 'feature/4795_add_matomo_event_names' into 'develop'
MESSENGER-4795 add matomo event names

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!154
2023-06-26 11:08:42 +00:00
JanNiklas Grabowski f33d85c143 MESSENGER-4795 add matomo event names 2023-06-26 12:19:39 +02:00
Frank Rotermund 14993296cd Merge branch 'feature/4897_new_hashes' into 'develop'
MESSENGER-4897 new hashes

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!153
2023-06-26 08:40:05 +00:00
Juergen Wischer 14f4d77710 MESSENGER-4897 new hashes 2023-06-26 08:37:46 +00:00
JanNiklas Grabowski c31a33a33b activate lab setting voice broadcast and enable session manager by default 2023-06-23 10:48:24 +02:00
JanNiklas Grabowski 722112bef0 Merge branch 'feature/4682_imprint_from_wellknown' into 'develop'
MESSENGER-4682 imprint from wellknown (and fix lab feature list)

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!151
2023-06-22 09:48:24 +00: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
Doug b1847a3ae5 Merge branch 'release/1.10.14/master' 2023-06-21 14:02:44 +01:00
Doug ee06fdfda0 finish version++ 2023-06-21 14:02:43 +01:00
Doug 824468c85c Merge pull request #7605 from vector-im/release/1.10.14/release
Release 1.10.14
2023-06-21 14:02:10 +01:00
Doug a4da401abd version++ 2023-06-21 12:01:26 +01:00
Doug 7c6ff1e463 changelog.d: Upgrade MatrixSDK version ([v0.26.12](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.12)). 2023-06-21 12:01:25 +01: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
Frank Rotermund 6aa6ce981f Merge branch 'feature/4769_color_changes_II' into 'develop'
MESSENGER-4769 color changes part 2

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!145
2023-06-20 11:32:09 +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