Skip to content
Snippets Groups Projects
Commit 39b032fb authored by Florian Spreckelsen's avatar Florian Spreckelsen
Browse files

Merge branch 'f-ckeditor-update-and-plugins' into 'dev'

DEP: Update ckeditor dependencies

See merge request !66
parents 7caa6f7a f3d58192
No related branches found
No related tags found
2 merge requests!68DOC: update CHANGELOG,!66DEP: Update ckeditor dependencies
Pipeline #20568 passed
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
## For CKEditor (WYSIWYG editor in edit mode) ## For CKEditor (WYSIWYG editor in edit mode)
* we're using a custom-built ckeditor 31.0.0 from * We're using a custom-built ckeditor 32.0.0 from [IndiScale's fork of CKEditor
https://ckeditor.com/ckeditor-5/online-builder/ with a customized set of 5](https://gitlab.indiscale.com/caosdb/src/ckeditor5) with a customized set of
editor plugins. Please refer to the `package.json` within editor plugins. Please refer to the `package.json` within
`libs/ckeditor...zip` for a full list of said plugins. `libs/ckeditor...zip` for a full list of said plugins.
......
...@@ -306,7 +306,7 @@ $(LIBS_DIR)/js/qrcode.js: unzip $(LIBS_DIR)/js ...@@ -306,7 +306,7 @@ $(LIBS_DIR)/js/qrcode.js: unzip $(LIBS_DIR)/js
ln -s $(LIBS_DIR)/qrcode-1.4.4/qrcode.min.js $@ ln -s $(LIBS_DIR)/qrcode-1.4.4/qrcode.min.js $@
$(LIBS_DIR)/js/ckeditor.js: unzip $(LIBS_DIR)/js $(LIBS_DIR)/js/ckeditor.js: unzip $(LIBS_DIR)/js
ln -s $(LIBS_DIR)/ckeditor5-31.0.0-k356w86hp13l/build/ckeditor.js $@ ln -s $(LIBS_DIR)/ckeditor5-build-custom/build/ckeditor.js $@
$(addprefix $(LIBS_DIR)/, js css): $(addprefix $(LIBS_DIR)/, js css):
......
File deleted
File added
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment