Commit Graph

32001 Commits

Author SHA1 Message Date
Arnfried Griesert
82beb4be2b Patched hotfix changes from bum into hotfix branch 5068_hide_room_display_in_notifications v2.8.2 2023-08-17 10:21:13 +02:00
Arnfried Griesert
5760c2bc53 Merge branch 'release/v2.8.0' v2.8.0 2023-08-10 17:03:54 +02:00
Arnfried Griesert
c96bf054a9 Changed podfile sdk version to v0.26.12_bwi 2023-08-09 09:14:52 +02:00
JanNiklas Grabowski
eee4b4c9a2 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
276fe9a6b6 Feature/enable notification times 2023-08-08 11:13:15 +00:00
Arnfried Griesert
68def4090b 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
2d6867941b MESSENGER-5022 added hash 2023-08-08 11:11:07 +00:00
JanNiklas Grabowski
98b19a5e49 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
1db4e3b1b8 feature/minor_release_changes 2023-08-07 16:18:58 +00:00
Arnfried Griesert
debd83dd19 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
e213313374 Final changes before release branch 2023-08-04 12:02:43 +00:00
Arnfried Griesert
c6305b0ed4 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
345a73ae15 Feature/4905 add migration progress information 2023-07-26 14:30:33 +00:00
Arnfried Griesert
937432c995 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
e5f822c556 MESSENGER-4295 add additional information for maintenance 2023-07-26 13:07:22 +00:00
Arnfried Griesert
44a6360469 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
769a902330 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
c0efc956f3 Changed colors for notification times buttons 2023-07-26 11:29:33 +00:00
Arnfried Griesert
aa2d6143d5 Color change 2023-07-21 09:34:41 +02:00
Frank Rotermund
f69d9d8433 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
dc5198f5d9 MESSENGER-4484 poi participants in history 2023-07-18 11:44:35 +00:00
JanNiklas Grabowski
b386e7c812 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
6afd9cb223 fix build problems 2023-07-17 13:56:08 +02:00
JanNiklas Grabowski
1c7dfa8098 Merge branch 'feature/4889_revert_deactivate_rust_for_prod' into 'develop'
revert '5bc3255dfe7b0a56aa3ce4b8056015b438653fed' 4889_deactivate_rust_for_prod

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!160
2023-07-17 08:54:43 +00:00
JanNiklas Grabowski
485f944c6c revert '5bc3255dfe7b0a56aa3ce4b8056015b438653fed' 4889_deactivate_rust_for_prod 2023-07-17 08:54:43 +00:00
Arnfried Griesert
db1787303c 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
fd7c694c8a MESSENGER-3580 Several bugfixes to notification times 2023-07-17 07:57:49 +00:00
Frank Rotermund
6a2101c858 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
dba6707074 Enable notification filtering 2023-07-12 15:18:16 +02:00
JanNiklas Grabowski
7db295ed18 merge branch 'release/v2.7.0' into develop 2023-07-11 18:41:08 +02:00
JanNiklas Grabowski
347112eabb Merge branch 'release/v2.7.0' v2.7.0 2023-07-11 18:33:04 +02:00
JanNiklas Grabowski
a1ba3a8c9b MESSENGER-4883 fix update room avatar 2023-07-10 18:12:31 +02:00
JanNiklas Grabowski
7f190db24e MESSENGER-4883 add color changes and manual app store upload for beta 2023-07-10 17:08:37 +02:00
JanNiklas Grabowski
cb68c4e9f1 MESSENGER-4819 change icon 2023-07-10 12:36:40 +02:00
JanNiklas Grabowski
b6af17ab7b change color on allchatsvc 2023-07-05 16:56:35 +02:00
JanNiklas Grabowski
1eb66fd37e MESSENGER-4882 changelog and fixes 2023-07-04 15:16:20 +02:00
Frank Rotermund
7fa1742f40 MESSENGER-4884 update build files 2023-07-04 08:24:45 +02:00
Frank Rotermund
242e35fdc7 Merge commit 'ab5f501c2daf60d26f41b1a15d7e97bfe5679228' 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
df66eda9fa MESSENGER-4929 show participant votes button when user has voted 2023-07-03 15:27:36 +02:00
JanNiklas Grabowski
232f526dd8 MESSENGER-4882 refactor delete avatar 2023-06-30 16:28:35 +02:00
Frank Rotermund
d49c0d59ad MESSENGER fix for broad casts 2023-06-30 14:55:04 +02:00
JanNiklas Grabowski
153d2a72f6 Update Appversion at sprint start 2023-06-29 18:16:38 +02:00
JanNiklas Grabowski
ebdd064e66 MESSENGER-4772 change font size 2023-06-29 12:18:10 +02:00
Frank Rotermund
531667ec5a 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
37f08fc886 MESSENGER-4819 2023-06-28 13:30:26 +02:00
Frank Rotermund
42c9520a20 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
a22c234e82 Feature/4889 deactivate rust for prod 2023-06-28 05:59:03 +00:00
Frank Rotermund
fe6f9c5fb7 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
e56f1d2a4e Feature/4753 bum test app 2023-06-26 12:22:44 +00:00
Frank Rotermund
abd7f01602 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