Commit Graph

19549 Commits

Author SHA1 Message Date
Frank Rotermund 2fd71ceb64 MESSENGER-5002 Increment app version to 2.9.0 2023-08-14 07:49:33 +02:00
Arnfried Griesert 524ad347e1 Merge tag 'v2.8.0' into develop
no message
2023-08-10 17:03:54 +02:00
Arnfried Griesert ac3a3f6698 Merge branch 'release/v2.8.0' 2023-08-10 17:03:54 +02:00
Arnfried Griesert 8d75466b30 Changed podfile sdk version to v0.26.12_bwi 2023-08-09 09:14:52 +02:00
JanNiklas Grabowski e1dc0d6693 Merge branch 'feature/enable_notification_times' into 'develop'
Feature/enable notification times

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!171
2023-08-08 11:13:16 +00:00
Arnfried Griesert 621882c076 Feature/enable notification times 2023-08-08 11:13:15 +00:00
Arnfried Griesert 1292df7bf6 Merge branch 'feature/5022_app_config' into 'develop'
MESSENGER-5022 added hash

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!170
2023-08-08 11:11:08 +00:00
Arnfried Griesert 5b14b95285 MESSENGER-5022 added hash 2023-08-08 11:11:07 +00:00
JanNiklas Grabowski 3540ece651 Merge branch 'feature/minor_release_changes' into 'develop'
feature/minor_release_changes

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!169
2023-08-07 16:18:59 +00:00
Arnfried Griesert 38801db710 feature/minor_release_changes 2023-08-07 16:18:58 +00:00
Arnfried Griesert 4ed5e016f2 Merge branch 'feature/release_preparation' into 'develop'
Final changes before release branch

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!168
2023-08-04 12:02:44 +00:00
Arnfried Griesert 4a6b31128c Final changes before release branch 2023-08-04 12:02:43 +00:00
Arnfried Griesert 4357b2ac0b Merge branch 'feature/4905_add_migration_progress_information' into 'develop'
Feature/4905 add migration progress information

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!165
2023-07-26 14:30:33 +00:00
JanNiklas Grabowski dec65229ff Feature/4905 add migration progress information 2023-07-26 14:30:33 +00:00
Arnfried Griesert 1f03bd22a6 Merge branch 'feature/4295_maintenance_with_additional_information' into 'develop'
MESSENGER-4295 add additional information for maintenance

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!166
2023-07-26 13:07:22 +00:00
JanNiklas Grabowski ace49da458 MESSENGER-4295 add additional information for maintenance 2023-07-26 13:07:22 +00:00
Arnfried Griesert 3b7cac93b5 Merge branch 'feature/wrong_color_poll_history' into 'develop'
Color change

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!164
2023-07-26 11:30:23 +00:00
Arnfried Griesert bdc61a9dc6 Merge branch 'feature/fixed_notification_times_button_color' into 'develop'
Changed colors for notification times buttons

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!167
2023-07-26 11:29:33 +00:00
Arnfried Griesert 86b0ce368a Changed colors for notification times buttons 2023-07-26 11:29:33 +00:00
Arnfried Griesert aaa088a139 Color change 2023-07-21 09:34:41 +02:00
Frank Rotermund 27fb3c0419 Merge branch 'feature/4484_poi_participants_history' into 'develop'
MESSENGER-4484 poi participants in history

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!159
2023-07-18 11:44:35 +00:00
Frank Rotermund 0868f56455 MESSENGER-4484 poi participants in history 2023-07-18 11:44:35 +00:00
JanNiklas Grabowski a4cef7376b Merge branch 'feature/4889_fix_build_problems' into 'develop'
fix build problems

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!162
2023-07-17 12:08:24 +00:00
JanNiklas Grabowski c884df05af fix build problems 2023-07-17 13:56:08 +02:00
JanNiklas Grabowski 6c597bcfb1 Merge branch 'feature/4889_revert_deactivate_rust_for_prod' into 'develop'
revert '813f9ad6302d421864736a6be596093c23cf35d7' 4889_deactivate_rust_for_prod

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!160
2023-07-17 08:54:43 +00:00
JanNiklas Grabowski 6dcf4ea8b6 revert '813f9ad6302d421864736a6be596093c23cf35d7' 4889_deactivate_rust_for_prod 2023-07-17 08:54:43 +00:00
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