Commit Graph

180 Commits

Author SHA1 Message Date
Arnfried Griesert 84a087e951 Removed adress label and enabled multiline for room names 2023-11-24 06:44:27 +01:00
Frank Rotermund b255b67f86 MESSENGER-5148 Restore Backup option 2023-11-14 12:56:34 +01: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 050320a50a MESSENGER-5310 added new hashes 2023-11-10 12:13:18 +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 cb9caa826c MESSENGER-5203 add feature flag for federation 2023-10-31 14:15:02 +01:00
Frank Rotermund 75ad20833b Merge branch 'release/v2.11.0' into develop
# Conflicts:
#	Podfile
2023-10-27 18:21:24 +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 e98e1b2195 MESSENGER-5252 releaseprep 2023-10-27 13:59:03 +02:00
Arnfried Griesert d87411be9d Merge branch 'feature/5254_basis_update_element' into 'develop'
MESSENGER-5254 basis update element

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!236
2023-10-25 13:44:33 +00:00
Arnfried Griesert fcf95a0c3f Changed build settings 2023-10-23 08:33:24 +02:00
Arnfried Griesert 69ef0fefcc Updated element version in BWIBuildSettings 2023-10-22 19:03:25 +02:00
Arnfried Griesert 7312ad09ad Merge branch 'feature/4433_content_scanner_upload' into 'develop'
MESSENGER-4433 content scanner upload

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!229
2023-10-10 12:33:47 +00:00
Arnfried Griesert 77cd8dbfe5 Content scanner thumbnail status 2023-10-10 07:17:36 +02:00
Arnfried Griesert c2d44580e4 Merge branch 'develop' into 'feature/5161_basis_update_element'
# Conflicts:
#   Podfile
2023-10-05 12:17:36 +00:00
Arnfried Griesert 1790efceae Updated app and element version 2023-09-29 05:39:50 +02:00
JanNiklas Grabowski 196ca4936e MESSENGER-5159 activate new room overview UI 2023-09-27 16:33:41 +02:00
Frank Rotermund 738512711d Merge branch 'feature/3811_appconfig' into 'develop'
Feature/3811 appconfig

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!218
2023-09-19 11:21:12 +00:00
Frank Rotermund 5dd5dc2db7 Feature/3811 appconfig 2023-09-19 11:21:12 +00:00
JanNiklas Grabowski 7f61eab4da MESSENGER-4751 add feature flag 2023-09-18 17:54:49 +02:00
JanNiklas Grabowski 043d277563 MESSENGER-4751 use privacy url of well known 2023-09-18 14:37:34 +02:00
Arnfried Griesert 667266e93c MESSENGER-4951 Changed password confirmation 2023-09-15 12:13:19 +00:00
Frank Rotermund 9a99402181 Merge branch 'feature/4730_personal_notes_visibilty' into 'develop'
MESSENGER-4730 personal notes visibility old style

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!204
2023-09-15 07:39:41 +00:00
Frank Rotermund 6a83893e3a MESSENGER-4730 personal notes visibility old style 2023-09-15 07:39:41 +00:00
JanNiklas Grabowski fdca2da2fa Merge branch 'feature/4955_disable_wysiwyg_commands' into 'develop'
MESSENGER 4955 disable WYSIWYG commands

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!206
2023-09-08 13:46:34 +00:00
Frank Rotermund 3b43285b26 Merge branch 'develop' into 'hotfix/v2.9.1'
# Conflicts:
#   Config/AppVersion.xcconfig
2023-09-08 08:20:37 +00:00
Frank Rotermund e66f865137 MESSENGER-5130 hotfix maintenance popup on missing server 2023-09-08 09:52:48 +02:00
Arnfried Griesert 63f7078771 Merge branch 'feature/4807_new_add_room_menu' into 'develop'
MESSENGER-4807 new add room menu

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!202
2023-09-08 06:41:41 +00:00
Arnfried Griesert 53c675638d MESSENGER-4807 new add room menu 2023-09-08 06:41:40 +00:00
JanNiklas Grabowski a8b759b63b MESSENGER 4955 disable WYSIWYG commands 2023-09-07 16:33:23 +02:00
Frank Rotermund 6b0df6aa2f MESSENGER-4802 personal notes in favorites 2023-09-07 12:53:46 +00:00
JanNiklas Grabowski c16bc6da5f Merge branch 'feature/4941_beta_features' into 'develop'
MESSENGER 4941 add and remove beta features

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!201
2023-09-07 12:35:41 +00:00
Arnfried Griesert ab949d8277 MESSENGER-4806 new room filter behaviour 2023-09-06 13:07:19 +00:00
JanNiklas Grabowski cd38534dc7 MESSENGER 4941 remove old feature flags 2023-09-06 14:29:58 +02:00
JanNiklas Grabowski 5a21e71235 MESSENGER 4941 deactivate voice broadcast 2023-09-06 13:39:59 +02:00
JanNiklas Grabowski 2ef1fe05e7 MESSENGER 4941 add and remove beta features 2023-09-05 17:05:44 +02:00
JanNiklas Grabowski 92c60bb4e5 Merge branch 'develop' into 'feature/5004_basis_update_element'
# Conflicts:
#   Podfile
2023-09-04 14:03:03 +00:00
JanNiklas Grabowski d4ab5f4bad MESSENGER 5004 add oidc flag 2023-08-31 12:13:03 +02:00
JanNiklas Grabowski 41b7905154 MESSENGER 5004 update element version string 2023-08-30 17:55:46 +02:00
Arnfried Griesert 7f4c310ecd MESSENGER-4704 UI Optimierungen Raumübersicht 2023-08-30 12:34:58 +00:00
Frank Rotermund 31f70e749f Feature/4976 ignore blocking maintenance 2023-08-22 12:02:43 +00:00
Arnfried Griesert 1b36ba2238 MESSENGER-5076 added new hash 2023-08-21 06:53:12 +00:00
Arnfried Griesert 8ba67f56b1 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
Arnfried Griesert f7b281a76a MESSENGER-5067 added new hash 2023-08-16 14:37:23 +00:00
Frank Rotermund 7568f86a95 MESSENGER-4549 Enable locationsharing per default when there is an url in well-known 2023-08-16 08:37:15 +02:00
Arnfried Griesert 2d6867941b MESSENGER-5022 added hash 2023-08-08 11:11:07 +00:00
Arnfried Griesert e213313374 Final changes before release branch 2023-08-04 12:02:43 +00:00
JanNiklas Grabowski e5f822c556 MESSENGER-4295 add additional information for maintenance 2023-07-26 13:07:22 +00:00