Merge 806d118 into 74364f2

liqd · May 14, 2019 · e7df60e · e7df60e
2 parents 74364f2 + 806d118
commit e7df60e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/liqd_product/assets/js/app.js b/liqd_product/assets/js/app.js
@@ -54,9 +54,6 @@ var init = function () {
 $(init)
 $(document).on('a4.embed.ready', init)
 
-// ugly hack to make ckeditor work with whitenoise
-window.CKEDITOR_BASEPATH = '/static/ckeditor/ckeditor/'
-
 module.exports = {
   'getCurrentPath': getCurrentPath
 }

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -13,7 +13,7 @@ brotli==1.0.7
 django-allauth==0.39.1
 django-autoslug==1.9.4
 django-background-tasks==1.2.0
-django-ckeditor==5.7.0
+django-ckeditor==5.7.1
 django-cloudflare-push==0.2.0
 django-filter==2.1.0
 django-multiselectfield==0.1.8