Skip to content

Commit

Permalink
Merge branch 'develop' into feature/DDS-72-add-sensor-plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
nicksantamaria authored Jan 5, 2024
2 parents 8045a4a + 7df6d47 commit 96187e8
Show file tree
Hide file tree
Showing 134 changed files with 3,287 additions and 3,537 deletions.
Binary file added .DS_Store
Binary file not shown.
36 changes: 36 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: build

on: push

jobs:
set_status_in_progress:
name: set_status_in_progress
if: always()
uses: dpc-sdp/github-actions/.github/workflows/set_status.yml@main
secrets: inherit
with:
context: 'tide_build'
description: 'Tide Build running...'
state: 'pending'
target_url: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}
tide_build:
name: tide_build
secrets: inherit
uses: dpc-sdp/github-actions/.github/workflows/tide_build.yml@main
with:
module_build: true
runner: biggy-tide
export_config:
name: export_config
secrets: inherit
uses: dpc-sdp/github-actions/.github/workflows/export_config.yml@main
set_status:
name: set_status
needs: [tide_build]
if: always()
uses: dpc-sdp/github-actions/.github/workflows/set_status.yml@main
secrets: inherit
with:
context: 'tide_build'
description: 'Tide Build'
target_url: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}
14 changes: 14 additions & 0 deletions .github/workflows/dorg_git_sync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: dorg_git_sync

on:
push:
branches:
- master
tags:
- '*'

jobs:
dorg_git_sync:
name: dorg_git_sync
uses: dpc-sdp/github-actions/.github/workflows/dorg_git_sync.yml@main
secrets: inherit
31 changes: 31 additions & 0 deletions .github/workflows/merge_to_reference.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: merge_to_reference

on:
push:
branches:
- develop

jobs:
set_status_in_progress:
name: set_status_in_progress
if: always()
uses: dpc-sdp/github-actions/.github/workflows/set_status.yml@main
secrets: inherit
with:
context: 'tide_merge_to_reference'
description: 'Merge to reference running...'
state: 'pending'
target_url: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}
tide_merge_to_reference:
name: tide_merge_to_reference
uses: dpc-sdp/github-actions/.github/workflows/tide_merge_to_reference.yml@main
set_status:
name: set_status
needs: [tide_merge_to_reference]
if: always()
uses: dpc-sdp/github-actions/.github/workflows/set_status.yml@main
secrets: inherit
with:
context: 'tide_merge_to_reference'
description: 'Merge to reference running...'
target_url: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Tide Core
Core functionality of [Tide](https://github.com/dpc-sdp/tide) distribution for [Drupal 8](https://github.com/dpc-sdp)
Core functionality of [Tide](https://github.com/dpc-sdp/tide) distribution for [Drupal 10](https://github.com/dpc-sdp)

Tide is a Drupal 8 distribution focused on delivering an API first, headless Drupal content administration site.
Tide is a Drupal 10 distribution focused on delivering an API first, headless Drupal content administration site.

[![CircleCI](https://circleci.com/gh/dpc-sdp/tide_core.svg?style=shield&circle-token=2a0e49166724ac193636fba5b458024e00342dce)](https://circleci.com/gh/dpc-sdp/tide_core)
[![Release](https://img.shields.io/github/release/dpc-sdp/tide_core.svg)](https://github.com/dpc-sdp/tide_core/releases/latest)
Expand Down
212 changes: 101 additions & 111 deletions composer.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
langcode: en
status: true
dependencies: { }
id: blockquote
label: Blockquote
description: 'Blockquote with 2 lines of caption'
thumb: { }
code: "<blockquote class=\"quotation\">\r\n<p>Berios sim destrum facientota nis ex eost aut prae vendis explam aliquis dolorpo rrorem reptaep elenis net.</p>\r\n\r\n<footer><cite><span class=\"quotation__author\">Her Excellency the Honourable Linda Dessau AC</span><br />\r\n<span class=\"quotation__author-title\">Governor of Victoria</span> </cite></footer>\r\n</blockquote>\r\n"
formats:
rich_text: rich_text
summary_text: summary_text
admin_text: admin_text
weight: 0
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
langcode: en
status: true
dependencies: { }
id: primary_button
label: 'Primary Button'
description: ''
thumb: { }
code: '<p><a class="button" href="Primary-button-link">Primary button text</a></p>'
formats:
rich_text: rich_text
summary_text: summary_text
admin_text: admin_text
weight: 1
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
langcode: en
status: true
dependencies: { }
id: secondary_button
label: 'Secondary Button'
description: ''
thumb: { }
code: '<p><a class="button button--secondary" href="Secondary-button-link">Secondary button text</a></p>'
formats:
rich_text: rich_text
summary_text: summary_text
admin_text: admin_text
weight: 2
157 changes: 86 additions & 71 deletions config/install/editor.editor.admin_text.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,85 +4,100 @@ dependencies:
config:
- filter.format.admin_text
module:
- ckeditor
- ckeditor5
format: admin_text
editor: ckeditor
editor: ckeditor5
settings:
toolbar:
rows:
-
-
name: Formatting
items:
- Bold
- Italic
- Strike
- Styles
- Superscript
- Subscript
- '-'
- RemoveFormat
- Copy
- Cut
- Paste
- PasteText
-
name: Links
items:
- DrupalLink
- Linkit
- DrupalUnlink
-
name: Lists
items:
- BulletedList
- NumberedList
items:
- bold
- italic
- strikethrough
- style
- superscript
- subscript
- removeFormat
- '|'
- link
- '|'
- bulletedList
- numberedList
- '|'
- blockQuote
- insertTable
- horizontalLine
- '|'
- alignment
- outdent
- indent
- heading
- '|'
- undo
- redo
- sourceEditing
- '|'
- code
- codeBlock
plugins:
ckeditor5_heading:
enabled_headings:
- heading2
- heading3
- heading4
- heading5
ckeditor5_style:
styles:
-
name: Media
items:
- Blockquote
- TideCallout
- Table
- HorizontalRule
label: Callout
element: '<p class="wysiwyg-callout">'
-
name: Format
items:
- JustifyLeft
- JustifyCenter
- JustifyRight
- JustifyBlock
- '-'
- Outdent
- Indent
- Format
label: 'Callout (Ordered list)'
element: '<ol class="wysiwyg-callout">'
-
name: Tools
items:
- Undo
- Redo
- ShowBlocks
- Maximize
- Source
- TemplateSelector
- Iframe
- wenzgmap
- tide_media
plugins:
language:
language_list: un
drupallink:
label: 'Callout (Unordered list)'
element: '<ul class="wysiwyg-callout">'
ckeditor5_sourceEditing:
allowed_tags:
- '<cite>'
- '<dl>'
- '<dt>'
- '<dd>'
- '<footer>'
- '<span class>'
- '<img src alt data-entity-type data-entity-uuid data-align data-caption>'
- '<div class>'
- '<iframe frameborder height scrolling src width title>'
- '<drupal-entity data-* title alt>'
- '<a hreflang target data-entity-substitution data-entity-type data-entity-uuid>'
- '<blockquote cite class>'
- '<ul type class>'
- '<ol type class>'
- '<h2 id>'
- '<h3 id>'
- '<h4 id>'
- '<h5 id>'
- '<th align class>'
- '<td align class>'
- '<p class="quotation__quote">'
ckeditor5_list:
reversed: false
startIndex: true
ckeditor5_alignment:
enabled_alignments:
- left
- center
- right
- justify
editor_advanced_link_link:
enabled_attributes:
- class
- id
- rel
- target
- title
linkit_extension:
linkit_enabled: true
linkit_profile: site_content
stylescombo:
styles: "p.wysiwyg-callout|Callout\r\nol.wysiwyg-callout|Callout (Ordered list)\r\nul.wysiwyg-callout|Callout (Unordered list)"
customconfig:
ckeditor_custom_config: ''
scayt:
scayt_autoStartup: 1
scayt_sLang: en_GB
scayt_disableOptionsStorage: all
tokenbrowser:
token_types: { }
image_upload:
status: false
scheme: public
Expand Down
Loading

0 comments on commit 96187e8

Please sign in to comment.