Commit Graph

20345 Commits

Author SHA1 Message Date
JanNiklas Grabowski
d1d6840d9d MESSENGER-6160 add release notes v2.19.0-RC01 2024-06-03 13:16:38 +02:00
JanNiklas Grabowski
dce825d334 Merge branch 'feature/6019_fix_permalink_bugs' into 'develop'
MESSENGER-6019 fix permalink bugs

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!372
2024-05-31 10:32:21 +00:00
JanNiklas Grabowski
59bf960b40 MESSENGER-6019 fix permalink bugs 2024-05-28 16:56:48 +02:00
JanNiklas Grabowski
04424628f9 Merge branch 'feature/6018_layout_changes_simplified_login_timeout' into 'develop'
MESSENGER-6018 layout changes simplified login and add error handling for timeouts

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!371
2024-05-28 09:28:56 +00:00
JanNiklas Grabowski
3475cdda0a MESSENGER-6018 layout changes simplified login and add error handling for timeouts 2024-05-24 13:38:14 +02:00
Arnfried Griesert
d314930b8a Merge branch 'feature/6107_changed_buildsettings' into 'develop'
MESSENGER-6107 New hash

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!367
2024-05-23 13:41:05 +00:00
Arnfried Griesert
378a6f5043 Merge branch 'develop' into 'feature/6107_changed_buildsettings'
# Conflicts:
#   Config/BWIBuildSettings.swift
2024-05-16 06:37:15 +00:00
Arnfried Griesert
8d71b20203 Resolved merge conflict caused bei another MR 2024-05-16 07:12:07 +02:00
Jürgen Wischer
df9741c530 skip gemfiles in trivy scan 2024-05-15 20:03:40 +02:00
JanNiklas Grabowski
25070ed252 Merge branch 'feature/6083_remove_hash' into 'develop'
MESSENGER-6083 remove hash

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!365
2024-05-14 06:40:22 +00:00
JanNiklas Grabowski
ffb07ce192 Merge branch 'feature/6114_fix_feature_banner_new_user' into 'develop'
MESSENGER-6114 fix top banner for new users who have not yet joined a room

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!366
2024-05-14 06:40:10 +00:00
Arnfried Griesert
0bd03ac38f Changed build settiings 2024-05-14 06:20:26 +02:00
JanNiklas Grabowski
333dd79181 MESSENGER-6114 fix top banner for new users who have not yet joined a room 2024-05-10 15:01:48 +02:00
JanNiklas Grabowski
66e89f2e6d MESSENGER-6083 remove hash 2024-05-10 13:07:46 +02:00
JanNiklas Grabowski
1a14f78076 Merge tag 'v2.18.0' into develop
Changes in BWI project 2.18.0 (2024-05-03)
===================================================

Upstream merge :
- v1.11.9

Features :

Improvements 🙌:
- Add save alert for changing users avatar (#5799)
- Change matomo alert text (#5829)

Bugfix 🐛:
- Fixed a crash when trying to add system errors to matrix error list (#5950)
- Fix picture selection for simulators (#5872)
- Fix button font in dark mode (#5999)
- Deactivate save button for functions if no text is provided (#5791)

Translations 🗣   :

SDK API changes ⚠️:

Build 🧱:
- Use XCode 15 for builds (#5948)
- Parallelized builds (#5761)
2024-05-08 15:55:35 +02:00
JanNiklas Grabowski
ea794f42a1 Merge branch 'release/v2.18.0' 2024-05-08 15:55:34 +02:00
JanNiklas Grabowski
ab9589a94f Merge branch 'releaseprep/v2.18.0' into 'release/v2.18.0'
Releaseprep/v2.18.0

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!364
2024-05-08 11:49:26 +00:00
JanNiklas Grabowski
a4496ffb0f MESSENGER-6069 update feature link and add dev information 2024-05-08 11:55:05 +02:00
JanNiklas Grabowski
2e0385f1c1 MESSENGER-6069 add releasenotes v2.18.0-RC01 2024-05-03 16:17:06 +02:00
JanNiklas Grabowski
e5638a0532 Merge branch 'feature/6069_update_app_version' into 'develop'
MESSENGER-6069 update app version

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!362
2024-05-03 11:11:14 +00:00
JanNiklas Grabowski
9a199117d2 MESSENGER-6069 update app version 2024-05-02 15:29:47 +02:00
JanNiklas Grabowski
c9e6385ff4 Merge branch 'feature/5791_disable_save_button_if_textfield_is_empty' into 'develop'
MESSENGER-5791 disable save button if textfield is empty

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!360
2024-04-25 13:49:09 +00:00
Arnfried Griesert
8d2c03aba0 Merge branch 'feature/6035_basisupdate_element_bum' into 'develop'
MESSENGER-6035 basisupdate element bum

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!358
2024-04-25 09:23:37 +00:00
JanNiklas Grabowski
0a8c38fc36 MESSENGER-5791 disable save button if textfield is empty 2024-04-24 09:00:08 +02:00
Frank Rotermund
4a8394f2e2 Merge branch 'feature/5950_crash_on_blocking' into 'develop'
MESSENGER-5950 be aware of none Matrix erros

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!359
2024-04-24 06:50:54 +00:00
Frank Rotermund
602db1fe78 MESSENGER-5950 be aware of none Matrix erros 2024-04-24 08:04:36 +02:00
Arnfried Griesert
7ee488710b Merged element v1.11.9 into bum 2024-04-23 16:13:09 +02:00
JanNiklas Grabowski
f319a3749a Merge branch 'feature/5872_fix_select_image_ios_15_simulator' into 'develop'
MESSENGER-5872 fix select image on ios 15 simulator

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!355
2024-04-17 13:26:38 +00:00
JanNiklas Grabowski
6b2bbe21fa Merge branch 'feature/5799_add_settings_alert_save_changes' into 'develop'
MESSENGER-5799 add settings alert save changes

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!357
2024-04-17 13:26:04 +00:00
JanNiklas Grabowski
cd6f70a49f MESSENGER-5799 add settings alert save changes 2024-04-17 12:54:22 +02:00
JanNiklas Grabowski
7f58cfde5b Merge branch 'feature/5999_fix_button_color_invite' into 'develop'
MESSENGER-5999 fix button color in darkmode

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!356
2024-04-16 06:48:05 +00:00
JanNiklas Grabowski
8ba35d624e MESSENGER-5999 fix button color in darkmode 2024-04-15 16:41:04 +02:00
JanNiklas Grabowski
97d6add9e6 MESSENGER-5872 fix select image on ios 15 simulator 2024-04-15 15:47:02 +02:00
Arnfried Griesert
755ec94542 Set app version to 2.18.0 2024-04-15 14:34:42 +02:00
Arnfried Griesert
b83aaedd9d Merge branch 'release/v2.17.0' 2024-04-15 11:32:28 +02:00
Arnfried Griesert
daea3c9ddb Merge branch 'master' into develop 2024-04-15 11:32:28 +02:00
Arnfried Griesert
bba4ce4f1d Merge branch 'releaseprep/v2.17.0' into 'release/v2.17.0'
MESSENGER-5953 Release Prep

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!353
2024-04-15 04:59:48 +00:00
Arnfried Griesert
7a85d05d17 Text changes in new features 2024-04-12 09:36:35 +02:00
Arnfried Griesert
dc18b6ecd2 Release changes 2024-04-12 05:54:09 +02:00
Frank Rotermund
7e9bab89e8 Merge branch 'feature/5948_build_on_macmini' into 'develop'
MESSENGER-5958 build on mac mini

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!348
2024-04-10 12:59:35 +00:00
Arnfried Griesert
40f9c41b3b Merge branch 'feature/5997_changed_buildsettings' into 'develop'
MESSENGER-5997 Hash

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!350
2024-04-09 11:39:12 +00:00
Arnfried Griesert
a523beb7c6 Merge branch 'feature/5458_check_federation_flag' into 'develop'
MESSENGER-5458 Check if federation is enabled in wellknown

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!349
2024-04-09 10:49:57 +00:00
Arnfried Griesert
8fed6dfbfe Changed build settings 2024-04-09 12:36:32 +02:00
JanNiklas Grabowski
74a163e711 Merge branch 'feature/5938_add_activate_labs_function' into 'develop'
MESSENGER-5938 activate labs

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!346
2024-04-09 07:02:27 +00:00
Arnfried Griesert
cf898c6917 Check if federation is enabled in wellknown 2024-04-09 07:15:13 +02:00
Frank Rotermund
1feda0dd9b MESSENGER-5958 remove FLEX debugging 2024-04-08 14:56:18 +02:00
Frank Rotermund
44541f50c8 Merge branch 'feature/5951_remove_command_list' into 'develop'
MESSENGER-5951 disable slash commands in old editor

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!347
2024-04-08 05:12:32 +00:00
JanNiklas Grabowski
c59b5b908e MESSENGER-5938 changes from review 2024-04-05 15:17:34 +02:00
Frank Rotermund
d0f5c67349 MESSENGER-5951 disable slash commands in old editor 2024-04-05 14:42:43 +02:00
JanNiklas Grabowski
85e163ae8d MESSENGER-5938 add condition 2024-04-05 14:01:39 +02:00