32327 Commits

Author SHA1 Message Date
JanNiklas Grabowski 429721ee74 Merge branch 'release/v2.12.0' v2.12.0 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
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
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
Arnfried Griesert 9054a802d8 Small gap removed at the bottom of the federation icon 2023-11-14 11:01:23 +01:00
JanNiklas Grabowski 795961a2ed Merge branch 'feature/5203_us01_add_federation_room_overview' into 'develop'
MESSENGER-5203 change image position

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!253
2023-11-14 07:38:14 +00:00
JanNiklas Grabowski d92a4e0fcf Merge branch 'feature/5208_5220_us09_and_us04' into 'develop'
MESSENGER-5208 and 5220 us09 and us04

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!252
2023-11-14 07:38:03 +00:00
Arnfried Griesert 03312447ce Pill size adjustment 2023-11-14 06:40:31 +01:00
JanNiklas Grabowski edfa89f313 MESSENGER-5203 change image position 2023-11-13 18:13:46 +01:00
JanNiklas Grabowski d6da4e7f75 MESSENGER-5208 and 5220 us09 and us04 2023-11-13 17:33:21 +01:00
JanNiklas Grabowski d1942c3884 MESSENGER-5033 layout changes login screen oidc 2023-11-13 12:46:19 +01:00
Arnfried Griesert 55084fd91a Added federation indicator to room info screen 2023-11-13 12:39:33 +01:00
JanNiklas Grabowski 6fca6743d3 Merge branch 'feature/5265_add_decryption_time_events_matomo' into 'develop'
Feature/5265 add decryption time events matomo

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!246
2023-11-13 09:25:48 +00:00
JanNiklas Grabowski 475a9b067c Merge branch 'feature/5310_new_hashes' into 'develop'
MESSENGER-5310 added new hashes

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!248
2023-11-10 13:08:29 +00:00
JanNiklas Grabowski 9bfca03f0b Merge branch 'feature/5297_fix_empty_chat_bubble' into 'develop'
MESSENGER-5297 fix empty chat bubble

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!247
2023-11-10 13:08:19 +00:00
JanNiklas Grabowski b04fd0aacf Merge branch 'feature/5203_us01_add_federation_room_overview' into 'develop'
Feature/5203 us01 add federation room overview

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!244
2023-11-10 13:08:08 +00:00
JanNiklas Grabowski 33cb2b4642 MESSENGER-5265 fix pipeline 2023-11-10 13:37:47 +01:00
JanNiklas Grabowski 050320a50a MESSENGER-5310 added new hashes 2023-11-10 12:13:18 +01:00
JanNiklas Grabowski ecea582d85 MESSENGER-5297 fix empty chat bubble 2023-11-09 18:11:04 +01:00
JanNiklas Grabowski 63f3b96ad3 MESSENGER-5265 add decryption time events matomo 2023-11-09 16:47:43 +01:00
JanNiklas Grabowski 3909b30382 MESSENGER-5265 decrypted event 2023-11-09 16:33:12 +01:00
JanNiklas Grabowski c6c874cf43 Merge branch 'develop' into 'feature/5203_us01_add_federation_room_overview'
# Conflicts:
#   Config/BWIBuildSettings.swift
2023-11-02 14:55:09 +00:00
JanNiklas Grabowski a213954135 MESSENGER-5203 add federation to lab settings and refactor 2023-11-02 15:35:25 +01:00
JanNiklas Grabowski be45b997da Merge branch 'feature/5236_remove_grey_shield' into 'develop'
MESSENGER 5236 remove grey green and red shield for room and user avatar

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!243
2023-11-02 12:01:58 +00:00
JanNiklas Grabowski 5f5aa69a73 MESSENGER-5203 add federation icon to tableview cell 2023-10-31 17:10:22 +01:00
JanNiklas Grabowski 2e4f9f59ab MESSENGER-5203 update acl handling 2023-10-31 16:35:30 +01:00
JanNiklas Grabowski cb9caa826c MESSENGER-5203 add feature flag for federation 2023-10-31 14:15:02 +01:00
JanNiklas Grabowski cdde55bfa8 MESSENGER-5203 add federation check for room 2023-10-31 14:14:13 +01:00
JanNiklas Grabowski 8223b56cc3 MESSENGER-5203 update sdk 2023-10-31 14:01:33 +01:00
Frank Rotermund 75ad20833b Merge branch 'release/v2.11.0' into develop
# Conflicts:
#	Podfile
2023-10-27 18:21:24 +02:00
Frank Rotermund 2d0c6507e1 Merge branch 'release/v2.11.0' v2.11.0 2023-10-27 18:20:47 +02:00
Frank Rotermund 0a8c393b01 Merge branch 'release/5252_releaseprep' into 'release/v2.11.0'
Release/5252 releaseprep

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!242
2023-10-27 13:52:49 +00:00
Frank Rotermund d08f75dc5d MESSENGER-5252 dont log analytics events on startup 2023-10-27 15:47:55 +02:00
JanNiklas Grabowski 2d07813bdc set imageview hidden 2023-10-27 15:22:25 +02:00
JanNiklas Grabowski 628d420dd9 MESSENGER 5236 remove grey green and red shield for room and user avatar 2023-10-27 14:37:22 +02:00
Frank Rotermund f938c34161 MESSENGER-5252 remove strict check for location sharing for bum4bwi 2023-10-27 14:10:24 +02:00
Frank Rotermund e98e1b2195 MESSENGER-5252 releaseprep 2023-10-27 13:59:03 +02:00
JanNiklas Grabowski 0731ce0ed7 Merge branch 'feature/5033_add_feature_flag_OIDC_login' into 'develop'
MESSENGER-5033 add feature flag for OIDC login

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!241
2023-10-27 06:43:26 +00:00
JanNiklas Grabowski 2c2482c5b6 refactor 2023-10-26 19:28:35 +02:00
JanNiklas Grabowski 4c61cf77aa MESSENGER-5033 change OIDC Button appearance 2023-10-26 16:05:08 +02:00
JanNiklas Grabowski f347f687a9 MESSENGER-5033 add feature flag for OIDC login 2023-10-26 13:35:13 +02:00