Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/composer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@ jobs:
docker network create frontend

- run: |
docker compose run --rm phpfpm composer audit
docker compose run --rm phpfpm composer audit --locked

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉 This should be added to our general project template.

2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Ignore all Drupal config since it is nearly all autogenerated by config-export
config/
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ Nedenfor ses dato for release og beskrivelse af opgaver som er implementeret.

## [Under udvikling]

* [PR-514](https://github.com/itk-dev/selvbetjening.aarhuskommune.dk/pull/514)
* Opdaterede til OS2Forms Core 5.1.0.
* Opdaterede `Full HTML`- og `Simpel HTML`-tekstformater til at benytte
CKEditor 5.
* Skiftede fra DAWA (udfaset) til adressevælgeren ifb. adresseopslag.
* Skiftede fra DAWA (udfaset) til datafordeleren ifb. matrikelopslag.
* Opdaterede til den moderniserede datafordeler ifb. CVR opslag og P-nummer
opslag.
* [PR-513](https://github.com/itk-dev/selvbetjening.aarhuskommune.dk/pull/513)
Tilføjede endnu en fiks køjobkommando – redigering!
* [PR-512](https://github.com/itk-dev/selvbetjening.aarhuskommune.dk/pull/512)
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"itk-dev/os2forms_nemlogin_openid_connect": "^2.2",
"itk-dev/os2forms_user_field_lookup": "^1.1",
"itk-dev/web_accessibility_statement": "^1.1",
"os2forms/os2forms": "dev-release/5.1.4 as 5.1.4",
"os2forms/os2forms": "dev-release/5.1.5 as 5.1.5",
"os2forms/os2forms_forloeb_profile": "^1.15",
"os2forms/os2forms_get_organized": "^2.0",
"os2forms/os2forms_organisation": "^2.1",
Expand Down
32 changes: 16 additions & 16 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ backend_configuration:
processor: daemon
processing_time: 280
locked: false
stop_when_empty: true
threshold:
type: 0
limit: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ backend_configuration:
processor: daemon
processing_time: 280
locked: false
stop_when_empty: true
threshold:
type: 0
limit: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ backend_configuration:
processor: daemon
processing_time: 280
locked: false
stop_when_empty: true
threshold:
type: 0
limit: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ backend_configuration:
processor: daemon
processing_time: 280
locked: false
stop_when_empty: true
threshold:
type: 0
limit: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ backend_configuration:
processor: daemon
processing_time: 90
locked: false
stop_when_empty: true
threshold:
type: 0
limit: 0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
uuid: null
uuid: b0f9375f-7d63-4260-a80a-389cdf703416
langcode: da
status: true
dependencies: {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ backend_configuration:
processor: daemon
processing_time: 280
locked: false
stop_when_empty: true
threshold:
type: 0
limit: 0
Expand Down
1 change: 0 additions & 1 deletion config/sync/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ module:
breakpoint: 0
chosen: 0
chosen_lib: 0
ckeditor: 0
ckeditor5: 0
clamav: 0
coc_forms_auto_export: 0
Expand Down
78 changes: 52 additions & 26 deletions config/sync/editor.editor.basic_html.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,63 @@ dependencies:
config:
- filter.format.basic_html
module:
- ckeditor
- ckeditor5
_core:
default_config_hash: a5AV-gXquwTaJSpYtmWEQiGfr7JWvtqAX7thbPr8qEk
format: basic_html
editor: ckeditor
editor: ckeditor5
settings:
toolbar:
rows:
- - name: Formatting
items:
- Bold
- Italic
- name: Linking
items:
- DrupalLink
- DrupalUnlink
- name: Lists
items:
- BulletedList
- NumberedList
- name: Media
items:
- Blockquote
- DrupalImage
- name: "Block Formatting"
items:
- Format
- name: Tools
items:
- Source
plugins: {}
items:
- bold
- italic
- "|"
- link
- "|"
- bulletedList
- numberedList
- "|"
- blockQuote
- drupalInsertImage
- "|"
- heading
- "|"
- sourceEditing
- "|"
- code
plugins:
ckeditor5_heading:
enabled_headings:
- heading2
- heading3
- heading4
- heading5
- heading6
ckeditor5_imageResize:
allow_resize: true
ckeditor5_list:
properties:
reversed: false
startIndex: true
multiBlock: true
ckeditor5_sourceEditing:
allowed_tags:
- "<cite>"
- "<dl>"
- "<dt>"
- "<dd>"
- "<span>"
- "<a hreflang>"
- "<blockquote cite>"
- "<ul type>"
- "<ol type>"
- "<h2 id>"
- "<h3 id>"
- "<h4 id>"
- "<h5 id>"
- "<h6 id>"
editor_advanced_link_link:
enabled_attributes: {}
image_upload:
status: true
scheme: public
Expand Down
74 changes: 51 additions & 23 deletions config/sync/editor.editor.full_html.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,61 @@ dependencies:
config:
- filter.format.full_html
module:
- ckeditor
- ckeditor5
_core:
default_config_hash: nKa3JTCziVQ5qit0NmNBNDUQboacUWjDvf9KnHdoebg
format: full_html
editor: ckeditor
editor: ckeditor5
settings:
toolbar:
rows:
- - name: Formatering
items:
- Bold
- Italic
- name: Links
items:
- DrupalLink
- DrupalUnlink
- name: Lister
items:
- BulletedList
- NumberedList
- name: Media
items:
- Blockquote
- DrupalImage
- name: Værktøjer
items:
- Source
plugins: {}
items:
- bold
- italic
- "|"
- link
- "|"
- bulletedList
- numberedList
- "|"
- blockQuote
- drupalInsertImage
- "|"
- sourceEditing
- "|"
- code
- heading
plugins:
ckeditor5_heading:
enabled_headings:
- heading2
- heading3
- heading4
- heading5
- heading6
ckeditor5_imageResize:
allow_resize: true
ckeditor5_list:
properties:
reversed: false
startIndex: true
multiBlock: true
ckeditor5_sourceEditing:
allowed_tags:
- "<cite>"
- "<dl>"
- "<dt>"
- "<dd>"
- "<h2 id>"
- "<h3 id>"
- "<h4 id>"
- "<h5 id>"
- "<h6 id>"
- "<a hreflang>"
- "<blockquote cite>"
- "<ul type>"
- "<ol type>"
- "<img data-entity-type data-entity-uuid>"
editor_advanced_link_link:
enabled_attributes: {}
image_upload:
status: false
2 changes: 1 addition & 1 deletion config/sync/entity_print.print_engine.dompdf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ settings:
cafile: ""
verify_peer: true
verify_peer_name: true
disable_log: false
orientation: portrait
disable_log: 0
1 change: 1 addition & 0 deletions config/sync/field.field.node.webform.body.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ default_value_callback: ""
settings:
display_summary: true
required_summary: false
allowed_formats: {}
field_type: text_with_summary
16 changes: 8 additions & 8 deletions config/sync/language/en/eu_cookie_compliance.settings.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
popup_agreed:
value: "<h2>Thank you for accepting cookies</h2><p>You can now hide this message or find out more about cookies.</p>"
popup_agree_button_message: Accept
popup_more_info_button_message: "More info"
popup_find_more_button_message: "More info"
popup_hide_button_message: Hide
popup_info:
value: "<h2>We use cookies on this site to enhance your user experience</h2><p>By clicking the Accept button, you agree to us doing so.</p>"
mobile_popup_info:
value: "<h2>We use cookies on this site to enhance your user experience</h2><p>By tapping the Accept button, you agree to us doing so.</p>"
popup_link: "<front>"
popup_agree_button_message: Accept
popup_more_info_button_message: "More info"
disagree_button_label: "No, thanks"
popup_agreed:
value: "<h2>Thank you for accepting cookies</h2><p>You can now hide this message or find out more about cookies.</p>"
popup_find_more_button_message: "More info"
popup_hide_button_message: Hide
popup_link: "<front>"
withdraw_message:
value: "<h2>We use cookies on this site to enhance your user experience</h2><p>You have given your consent for us to set cookies.</p>"
withdraw_action_button_label: "Withdraw consent"
withdraw_tab_button_label: "Privacy settings"
withdraw_action_button_label: "Withdraw consent"
save_preferences_button_label: "Save preferences"
accept_all_categories_button_label: "Accept all cookies"
Loading
Loading