Commit Graph

19568 Commits

Author SHA1 Message Date
Frank Rotermund 489ea39535 Merge branch 'feature/4976_ignore_blocking_maintenance' into 'develop'
Feature/4976 ignore blocking maintenance

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!183
2023-08-22 12:02:43 +00:00
Frank Rotermund 3885b8ca97 Feature/4976 ignore blocking maintenance 2023-08-22 12:02:43 +00:00
Arnfried Griesert cd08a4f3ef Merge branch 'feature/4549_stricter_url_check_location_sharing' into 'develop'
MESSENGER-4549 strict check for mapstyle url

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!184
2023-08-22 08:38:31 +00:00
Arnfried Griesert 1ee6408958 Merge branch 'feature/4966_color_changes' into 'develop'
MESSENGER-4966 color changes login flow and all chat

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!174
2023-08-22 08:35:29 +00:00
JanNiklas Grabowski 0095c41ee4 MESSENGER-4966 color changes login flow and all chat 2023-08-22 08:35:28 +00:00
Frank Rotermund ce6c915647 MESSENGER-4549 strict check for mapstyle url 2023-08-22 08:10:13 +02:00
Frank Rotermund 30ca54a025 Merge branch 'feature/5035_dont_reset_element_call_permissions' into 'develop'
MESSENGER-5035 Don't reset element call permissions

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!181
2023-08-21 14:03:28 +00:00
Arnfried Griesert 7958658ce9 MESSENGER-5035 Don't reset element call permissions 2023-08-21 14:03:28 +00:00
Frank Rotermund 8938b080f4 Merge branch 'feature/change_show_poll_history_button_text' into 'develop'
Change show poll history button text (patched from BwM)

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!182
2023-08-21 14:03:09 +00:00
Arnfried Griesert be9e2540a2 Change show poll history button text (patched from BwM) 2023-08-21 14:03:09 +00:00
Frank Rotermund 467d0dac7f Merge branch 'feature/5076_changed_config' into 'develop'
MESSENGER-5076 added new hash

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!180
2023-08-21 06:53:13 +00:00
Arnfried Griesert 4ec1b19958 MESSENGER-5076 added new hash 2023-08-21 06:53:12 +00:00
Arnfried Griesert cf477301ba Merge branch master into develop 2023-08-17 10:59:17 +02:00
Arnfried Griesert 2f207091db Patched hotfix changes from bum into hotfix branch 5068_hide_room_display_in_notifications 2023-08-17 10:21:13 +02:00
Arnfried Griesert 0660b320bc Merge branch 'feature/4549_location_sharing_bum' into 'develop'
MESSENGER-4549 Enable locationsharing per default when there is an url in well-known

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!176
2023-08-16 14:53:56 +00:00
Arnfried Griesert 5e0c51dff8 Merge branch 'feature/5067_changed_config' into 'develop'
MESSENGER-5067 added new hash

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!177
2023-08-16 14:37:23 +00:00
Arnfried Griesert b7df4789e4 MESSENGER-5067 added new hash 2023-08-16 14:37:23 +00:00
Frank Rotermund a89785fd0d MESSENGER-4549 Enable locationsharing per default when there is an url in well-known 2023-08-16 08:37:15 +02:00
Arnfried Griesert 0854a9e496 Merge branch 'feature/5002_Increment_version' into 'develop'
MESSENGER-5002 Increment app version to 2.9.0

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!175
2023-08-14 06:30:27 +00:00
Frank Rotermund 2fd71ceb64 MESSENGER-5002 Increment app version to 2.9.0 2023-08-14 07:49:33 +02:00
Arnfried Griesert ac3a3f6698 Merge branch 'release/v2.8.0' 2023-08-10 17:03:54 +02:00
Arnfried Griesert 524ad347e1 Merge tag 'v2.8.0' into develop
no message
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