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
be9e2540a2
Change show poll history button text (patched from BwM)
2023-08-21 14:03:09 +00:00
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
4ec1b19958
MESSENGER-5076 added new hash
2023-08-21 06:53:12 +00:00
cf477301ba
Merge branch master into develop
2023-08-17 10:59:17 +02:00
2f207091db
Patched hotfix changes from bum into hotfix branch 5068_hide_room_display_in_notifications
2023-08-17 10:21:13 +02:00
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
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
b7df4789e4
MESSENGER-5067 added new hash
2023-08-16 14:37:23 +00:00
a89785fd0d
MESSENGER-4549 Enable locationsharing per default when there is an url in well-known
2023-08-16 08:37:15 +02:00
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
2fd71ceb64
MESSENGER-5002 Increment app version to 2.9.0
2023-08-14 07:49:33 +02:00
ac3a3f6698
Merge branch 'release/v2.8.0'
2023-08-10 17:03:54 +02:00
524ad347e1
Merge tag 'v2.8.0' into develop
...
no message
2023-08-10 17:03:54 +02:00
8d75466b30
Changed podfile sdk version to v0.26.12_bwi
2023-08-09 09:14:52 +02:00
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
621882c076
Feature/enable notification times
2023-08-08 11:13:15 +00:00
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
5b14b95285
MESSENGER-5022 added hash
2023-08-08 11:11:07 +00:00
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
38801db710
feature/minor_release_changes
2023-08-07 16:18:58 +00:00
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
4a6b31128c
Final changes before release branch
2023-08-04 12:02:43 +00:00
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
dec65229ff
Feature/4905 add migration progress information
2023-07-26 14:30:33 +00:00
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
ace49da458
MESSENGER-4295 add additional information for maintenance
2023-07-26 13:07:22 +00:00
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
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
86b0ce368a
Changed colors for notification times buttons
2023-07-26 11:29:33 +00:00
aaa088a139
Color change
2023-07-21 09:34:41 +02:00
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
0868f56455
MESSENGER-4484 poi participants in history
2023-07-18 11:44:35 +00:00
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
c884df05af
fix build problems
2023-07-17 13:56:08 +02:00
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
6dcf4ea8b6
revert '813f9ad6302d421864736a6be596093c23cf35d7' 4889_deactivate_rust_for_prod
2023-07-17 08:54:43 +00:00
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
8f4f052303
MESSENGER-3580 Several bugfixes to notification times
2023-07-17 07:57:49 +00:00
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
f645005368
Enable notification filtering
2023-07-12 15:18:16 +02:00
069209f952
merge branch 'release/v2.7.0' into develop
2023-07-11 18:41:08 +02:00
276fda6cb0
Merge branch 'release/v2.7.0'
2023-07-11 18:33:04 +02:00
0a215f376e
MESSENGER-4883 fix update room avatar
2023-07-10 18:12:31 +02:00
cd5cf18b6c
MESSENGER-4883 add color changes and manual app store upload for beta
2023-07-10 17:08:37 +02:00
95452b58ab
MESSENGER-4819 change icon
2023-07-10 12:36:40 +02:00
9a931d7734
change color on allchatsvc
2023-07-05 16:56:35 +02:00
cc3f55e0e2
MESSENGER-4882 changelog and fixes
2023-07-04 15:16:20 +02:00
18a516db3b
MESSENGER-4884 update build files
2023-07-04 08:24:45 +02:00
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
Frank Rotermund
Arnfried Griesert
Arnfried Griesert
JanNiklas Grabowski