Skip to content

Commit 749f279

Browse files
authored
Merge pull request #697 from City-of-Helsinki/update-configuration
Automatic update
2 parents 3f2c3da + 752b112 commit 749f279

12 files changed

Lines changed: 393 additions & 241 deletions

compose.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -161,16 +161,6 @@ services:
161161
- "traefik.port=9200"
162162
profiles:
163163
- search
164-
artemis:
165-
container_name: "${COMPOSE_PROJECT_NAME}-artemis"
166-
image: apache/activemq-artemis
167-
depends_on:
168-
- app
169-
networks:
170-
- internal
171-
- stonehenge-network
172-
profiles:
173-
- queue
174164
chromium:
175165
image: selenium/standalone-chromium
176166
environment:

composer.lock

Lines changed: 346 additions & 148 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conf/cmi/block.block.helfirecommendationsblock.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ dependencies:
55
module:
66
- helfi_recommendations
77
- language
8-
- node
8+
- system
99
theme:
1010
- hdbt
1111
id: helfirecommendationsblock
1212
theme: hdbt
1313
region: content
14-
weight: 1
14+
weight: 10
1515
provider: helfi_recommendations
1616
plugin: helfi_recommendations
1717
settings:

conf/cmi/core.extension.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ module:
153153
social_media: 0
154154
sophron: 0
155155
stage_file_proxy: 0
156-
stomp: 0
157156
system: 0
158157
taxonomy: 0
159158
telephone: 0

conf/cmi/editor.editor.full_html.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77
module:
88
- ckeditor5
99
_core:
10-
default_config_hash: UZ7ojJKs8sEbFs15e0Ub1i_p9w-K20fG40pkpotEWUw
10+
default_config_hash: oCDUwt4GjXQJeBCiJlq5NKEU0d9JP2Kx3QZKMuDAi_g
1111
format: full_html
1212
editor: ckeditor5
1313
settings:
@@ -146,6 +146,11 @@ settings:
146146
weight: 18
147147
search: '<a name="[^"]*">(.*?)<\/a>'
148148
replace: $1
149+
-
150+
enabled: true
151+
weight: 19
152+
search: '(<a\b[^>]*?)\s+target\s*=\s*("_blank"|_blank)'
153+
replace: $1
149154
ckeditor5_sourceEditing:
150155
allowed_tags:
151156
- '<figure tabindex>'

conf/cmi/editor.editor.minimal.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies:
77
module:
88
- ckeditor5
99
_core:
10-
default_config_hash: CbXr91M60wTYziM5ZHPNPrGb9khkUYjzkVVdyE3re9o
10+
default_config_hash: 5XykmWxByyrIQ2N9_zHqVQlMtBUy9wc5P9lPrM_g7oQ
1111
format: minimal
1212
editor: ckeditor5
1313
settings:
@@ -128,6 +128,11 @@ settings:
128128
weight: 18
129129
search: '<a name="[^"]*">(.*?)<\/a>'
130130
replace: $1
131+
-
132+
enabled: true
133+
weight: 19
134+
search: '(<a\b[^>]*?)\s+target\s*=\s*("_blank"|_blank)'
135+
replace: $1
131136
ckeditor5_sourceEditing:
132137
allowed_tags:
133138
- '<p data-chat-trigger>'

conf/cmi/imagemagick.settings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ _core:
22
default_config_hash: do7QLcSY6lDV82NBI3jy5FNsUwWFjjJzXmHPTGsSvIQ
33
quality: 75
44
binaries: imagemagick
5+
imagemagick_version: v7
56
path_to_binaries: ''
67
prepend: ''
78
log_warnings: true
@@ -58,4 +59,3 @@ advanced:
5859
colorspace: '0'
5960
profile: ''
6061
coalesce: false
61-
imagemagick_version: v6

conf/cmi/language/sv/views.view.archive.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,7 @@ display:
2121
exposed_sorts_label: 'Sortera efter'
2222
sort_asc_label: Stigande
2323
sort_desc_label: Fallande
24-
arguments:
25-
created_year_month:
26-
title: '{{ arguments.created_year_month }}'
2724
block_1:
2825
display_title: Block
29-
display_options:
30-
arguments:
31-
created_year_month:
32-
title: '{{ arguments.created_year_month }}'
3326
page_1:
3427
display_title: Sida

conf/cmi/language/sv/views.view.files.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ display:
66
display_options:
77
title: Filer
88
fields:
9-
fid:
10-
label: Fid
119
filename:
1210
label: Namn
1311
separator: ', '
@@ -26,8 +24,6 @@ display:
2624
label: 'Datum för ändring'
2725
count:
2826
label: 'Används i'
29-
alter:
30-
path: 'admin/content/files/usage/{{ fid }}'
3127
format_plural_string: !!binary MSBwbGFjZQNAY291bnQgcGxhY2Vz
3228
pager:
3329
options:
@@ -76,7 +72,6 @@ display:
7672
label: 'Registrerar modul'
7773
count:
7874
label: 'Antal använd'
79-
format_plural_string: !!binary MQNAY291bnQ=
8075
pager:
8176
options:
8277
tags:

conf/cmi/language/sv/views.view.user_admin_people.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ display:
1919
label: Roller
2020
created:
2121
label: 'Medlem i'
22-
settings:
23-
future_format: '@interval'
24-
past_format: '@interval'
2522
access:
2623
label: 'Senast åtkomst'
2724
settings:

0 commit comments

Comments
 (0)