32364 Commits

Author SHA1 Message Date
Frank Rotermund 59ee43ed5c Merge branch 'release/v2.12.1' v2.12.1 2023-12-12 13:05:47 +01:00
Frank Rotermund 866aae5cbd Merge branch 'release/release_prep_2.12.1_2' into 'release/v2.12.1'
MESSENGER-5359 fix crosssigning crash in sdk

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!276
2023-12-12 11:54:56 +00:00
Frank Rotermund be2eb9f05c MESSENGER-5359 fix crosssigning crash in sdk 2023-12-12 10:25:55 +01:00
Frank Rotermund d0833e2845 Merge branch 'release/release_prep_2.12.1' into 'release/v2.12.1'
Release/release prep 2.12.1

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!274
2023-12-11 16:02:36 +00:00
Frank Rotermund 6f979affb8 Release/release prep 2.12.1 2023-12-11 16:02:36 +00:00
Frank Rotermund 75de3bacc4 Merge branch 'feature/5408_hashes' into 'develop'
MESSENGER-5308 hashes

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!273
2023-12-08 15:55:15 +00:00
Frank Rotermund 196412badd MESSENGER-5308 hashes 2023-12-08 13:02:15 +01:00
Frank Rotermund 3d4a679f30 Merge branch 'feature/5308_SSO_on_internal_browser' into 'develop'
Feature/5308 sso on internal browser

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!272
2023-12-08 11:42:02 +00:00
Frank Rotermund 02bb97687d Feature/5308 sso on internal browser 2023-12-08 11:42:02 +00:00
JanNiklas Grabowski bdb8a7a92f Merge branch 'feature/4846_us02_add_federate_toggle_for_room_creation' into 'develop'
Feature/4846 us02 add federate toggle for room creation

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!271
2023-12-08 09:37:45 +00:00
JanNiklas Grabowski 5974c24118 MESSENGER-4846 add federate toggle for room creation 2023-12-07 12:27:21 +01:00
JanNiklas Grabowski 7849724638 MESSENGER-4846 add federate toggle for room creation 2023-12-07 12:15:16 +01:00
Frank Rotermund 39e6e299eb Merge branch 'feature/5271_crosssigning_with_button' into 'develop'
MESSENGER-5271 crosssigning - verification request on button click

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!267
2023-12-05 14:19:30 +00:00
Frank Rotermund 02fafc966e MESSENGER-5271 hide crosssigning information when only one device 2023-12-05 14:55:00 +01:00
JanNiklas Grabowski d67a713630 Merge branch 'feature/5311_add_userid_to_room_member_details_view' into 'develop'
Feature/5311 add userid to room member details view

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!263
2023-12-05 12:20:00 +00:00
JanNiklas Grabowski 665be642e3 Merge branch 'feature/5358_add_wysiwyg_composer_switch' into 'develop'
MESSENGER-5358 add switch in settings for wysiwyg composer

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!264
2023-12-05 12:18:03 +00:00
JanNiklas Grabowski b391e08702 Merge branch 'feature/fix_nexus_upload' into 'develop'
Feature/fix nexus upload

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!265
2023-12-05 12:17:09 +00:00
Frank Rotermund cd1b7053e8 MESSENGER-5271 buildfix 2023-12-05 13:00:17 +01:00
Juergen Wischer 41b16a668b Merge branch 'feature/sonarqube' into 'develop'
add sonarqube job

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!269
2023-12-05 11:52:26 +00:00
Juergen Wischer 948672d840 add sonarqube job 2023-12-05 11:52:25 +00:00
Frank Rotermund c8a32e3431 MESSENGER-5271 crosssigning - add alert and better strings, only show button when usable 2023-12-05 12:46:26 +01:00
Frank Rotermund 9a997510c5 MESSENGER-5271 crosssigning - verification request on button click 2023-11-30 14:19:58 +01:00
JanNiklas Grabowski da471b22ca fix nexus upload path 2023-11-30 10:11:52 +01:00
JanNiklas Grabowski 2842f021ab MESSENGER-5358 add switch in settings for wysiwyg composer 2023-11-29 15:32:00 +01:00
JanNiklas Grabowski f26928de8f MESSENGER-5311 change label name 2023-11-29 12:19:25 +01:00
JanNiklas Grabowski 73f6db4dca MESSENGER-5311 add userid to room member details view 2023-11-29 11:56:54 +01:00
JanNiklas Grabowski d446aaf24e Merge branch 'feature/5307_fix_add_room_button_appearance' into 'develop'
MESSENGER-5307 fix add room button appearance

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!261
2023-11-29 07:45:21 +00:00
JanNiklas Grabowski b0d96b3bbc Merge branch 'feature/5319_server_info_button_appearance' into 'develop'
MESSENGER-5319 change server info text color

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!260
2023-11-29 07:44:52 +00:00
JanNiklas Grabowski b5b8458dff MESSENGER-5307 fix add room button appearance 2023-11-28 14:50:29 +01:00
JanNiklas Grabowski 53ae1048f0 MESSENGER-5319 change server info text color 2023-11-27 17:00:51 +01:00
JanNiklas Grabowski 429721ee74 Merge branch 'release/v2.12.0' v2.12.0 2023-11-27 15:46:47 +01:00
JanNiklas Grabowski abc3b27369 Merge tag 'v2.12.0' into develop
Changes in BWI project 2.12.0 (2023-11-21)
===================================================

Upstream merge :

Features :

Improvements 🙌:
- Layout changes OIDC login (#5033)
- Added restore key backup in settings (#5184)
- Added federation icons for beta app (#5203, #5208, #5220)
- Remove grey shield (#5236)
- Tracking of decryption duration (#5265)

Bugfix 🐛:
- Fix empty chat bubble (#5297)

Translations 🗣  :

SDK API changes ⚠️:

Build 🧱:
2023-11-27 15:46:47 +01:00
JanNiklas Grabowski d808354782 Merge branch 'releaseprep/v2.12.0' into 'release/v2.12.0'
Releaseprep/v2.12.0

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!259
2023-11-27 14:37:30 +00:00
Frank Rotermund e906e4ab29 Merge branch 'feature/5361_bwi_mdm_beta_target' into 'develop'
Feature/5361 bwi mdm beta target

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!258
2023-11-27 11:03:57 +00:00
Frank Rotermund 5ffffc5860 Feature/5361 bwi mdm beta target 2023-11-27 11:03:57 +00:00
Arnfried Griesert 9b65c75e58 Merge branch 'feature/5216_additional_changes' into 'develop'
MESSENGER-5216 additional changes in room info screen

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!257
2023-11-24 14:20:32 +00:00
Arnfried Griesert 84a087e951 Removed adress label and enabled multiline for room names 2023-11-24 06:44:27 +01:00
JanNiklas Grabowski 50b825589c Changelog text changes 2023-11-21 16:15:49 +01:00
JanNiklas Grabowski 63c598e053 MESSENGER-5327 update changelog 2023-11-21 15:55:09 +01:00
JanNiklas Grabowski 6691590614 MESSENGER-5240 fix crash set personal notes room as favorite 2023-11-21 12:30:15 +01:00
JanNiklas Grabowski f32ed6a2f0 MESSENGER-5327 update sdk version 2023-11-21 10:29:10 +01:00
JanNiklas Grabowski eace4265ff Merge branch 'feature/5327_update_app_version' into 'develop'
MESSENGER-5327 update app version

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!256
2023-11-21 08:40:27 +00:00
JanNiklas Grabowski a83f80fc8d MESSENGER-5327 update app version 2023-11-21 09:01:21 +01:00
Frank Rotermund b8fa135c48 Merge branch 'feature/5327_releaseprep' into 'develop'
Feature/5327 releaseprep

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!255
2023-11-21 06:33:21 +00:00
Frank Rotermund 958727d304 Feature/5327 releaseprep 2023-11-21 06:33:20 +00:00
Arnfried Griesert 212c32adb4 Merge branch 'feature/5216_federation_us03' into 'develop'
MESSENGER-5216 Added federation indicator to room info screen

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!249
2023-11-15 07:42:32 +00:00
Frank Rotermund aff701d45f Merge branch 'feature/5184_restore_keys_from_backup' into 'develop'
MESSENGER-5148 Restore Backup option

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!254
2023-11-14 14:53:23 +00:00
Frank Rotermund b255b67f86 MESSENGER-5148 Restore Backup option 2023-11-14 12:56:34 +01:00
Arnfried Griesert 12087babd4 Pill heigh set to 20px 2023-11-14 12:49:19 +01:00
Arnfried Griesert f662d519be Set federation pill height to 16px 2023-11-14 11:14:03 +01:00