Skip to content

Commit

Permalink
Merge branch 'main' into feature/bbcode-dataprocessor
Browse files Browse the repository at this point in the history
# Conflicts:
#	app/package.json
#	app/src/ckeditor.ts
  • Loading branch information
pkliesch committed Aug 24, 2023
2 parents d08154d + 37f9829 commit 1a87ea5
Show file tree
Hide file tree
Showing 775 changed files with 15,808 additions and 1,634 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ on:
description: 'Release type. Allowed values: "major", "minor", "patch"'
required: true
default: 'patch'

permissions:
contents: write
env:
NODE_VERSION: 18
# https://github.com/actions/runner-images/issues/70
Expand Down Expand Up @@ -58,7 +59,7 @@ jobs:
echo "::add-mask::$NPM_AUTH_TOKEN"
echo "NPM_AUTH_TOKEN=$NPM_AUTH_TOKEN" >> $GITHUB_ENV
echo "NPM_CONFIG_//npm.coremedia.io/:_authToken=$NPM_AUTH_TOKEN" >> $GITHUB_ENV
npm install -g pnpm@${{ env.PNPM_VERSION }}
npm install -g semver
- name: Setup Git
Expand Down
2 changes: 1 addition & 1 deletion .release-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
15.0.1
15.0.2-rc.1
26 changes: 13 additions & 13 deletions app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@coremedia/ckeditor5-app",
"description": "A custom CKEditor 5 build made by the CKEditor 5 online builder.",
"version": "15.0.1",
"version": "15.0.2-rc.1",
"engines": {
"node": "18",
"pnpm": "^8.1"
Expand Down Expand Up @@ -37,18 +37,18 @@
"@ckeditor/ckeditor5-ui": "37.1.0",
"@ckeditor/ckeditor5-utils": "37.1.0",
"@coremedia-internal/ckeditor5-coremedia-example-data": "^1.0.0",
"@coremedia/ckeditor5-coremedia-bbcode": "^15.0.1",
"@coremedia/ckeditor5-coremedia-content-clipboard": "^15.0.1",
"@coremedia/ckeditor5-coremedia-differencing": "^15.0.1",
"@coremedia/ckeditor5-coremedia-images": "^15.0.1",
"@coremedia/ckeditor5-coremedia-link": "^15.0.1",
"@coremedia/ckeditor5-coremedia-richtext": "^15.0.1",
"@coremedia/ckeditor5-coremedia-studio-essentials": "^15.0.1",
"@coremedia/ckeditor5-coremedia-studio-integration-mock": "^15.0.1",
"@coremedia/ckeditor5-dataprocessor-support": "^15.0.1",
"@coremedia/ckeditor5-dom-converter": "^15.0.1",
"@coremedia/ckeditor5-font-mapper": "^15.0.1",
"@coremedia/ckeditor5-link-common": "^15.0.1",
"@coremedia/ckeditor5-coremedia-bbcode": "15.0.2-rc.1",
"@coremedia/ckeditor5-coremedia-content-clipboard": "15.0.2-rc.1",
"@coremedia/ckeditor5-coremedia-differencing": "15.0.2-rc.1",
"@coremedia/ckeditor5-coremedia-images": "15.0.2-rc.1",
"@coremedia/ckeditor5-coremedia-link": "15.0.2-rc.1",
"@coremedia/ckeditor5-coremedia-richtext": "15.0.2-rc.1",
"@coremedia/ckeditor5-coremedia-studio-essentials": "15.0.2-rc.1",
"@coremedia/ckeditor5-coremedia-studio-integration-mock": "15.0.2-rc.1",
"@coremedia/ckeditor5-dataprocessor-support": "15.0.2-rc.1",
"@coremedia/ckeditor5-dom-converter": "15.0.2-rc.1",
"@coremedia/ckeditor5-font-mapper": "15.0.2-rc.1",
"@coremedia/ckeditor5-link-common": "15.0.2-rc.1",
"@coremedia/service-agent": "^1.1.5",
"xml-formatter": "^3.3.2"
},
Expand Down
6 changes: 6 additions & 0 deletions app/src/editors/default.ts
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,12 @@ export const createDefaultEditor = (language = "en") => {
},
link: {
defaultProtocol: "https://",
/*defaultTargets: [
{
type: "externalLink",
target: "_blank",
},
],*/
...linkAttributesConfig,
/*decorators: {
hasTitle: {
Expand Down
2 changes: 1 addition & 1 deletion docs/api/assets/search.js

Large diffs are not rendered by default.

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

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

Loading

0 comments on commit 1a87ea5

Please sign in to comment.