Merge pull request #31 from industrydive/TECH-3693-ckeditor-autosave

TECH-3693 ckeditor autosave
industrydive · Feb 26, 2018 · a3faab2 · a3faab2
2 parents 41d9868 + f44226c
commit a3faab2
Show file tree

Hide file tree

Showing 65 changed files with 2,340 additions and 496 deletions.
diff --git a/ckeditor/__init__.py b/ckeditor/__init__.py
@@ -4,7 +4,7 @@
 from django.core.exceptions import ImproperlyConfigured
 
 # Following PEP 440 Standards
-__version__ ='4.4.7+dive.ckeditor.7' # update this when deploying new version to production
+__version__ ='4.4.7+dive.ckeditor.9' # update this when deploying new version to production
 
 if 'ckeditor' in settings.INSTALLED_APPS:
  # Confirm CKEDITOR_UPLOAD_PATH setting has been specified.

diff --git a/ckeditor/static/ckeditor/ckeditor/config.js b/ckeditor/static/ckeditor/ckeditor/config.js
@@ -4,7 +4,7 @@
  */
 
 CKEDITOR.editorConfig = function( config ) {
- // Define changes to default configuration here. For example:
- // config.language = 'fr';
- // config.uiColor = '#AADC6E';
+ // Define changes to default configuration here. For example:
+ // config.language = 'fr';
+ // config.uiColor = '#AADC6E';
 };
diff --git a/ckeditor/static/ckeditor/ckeditor/plugins/autosave/css/autosave.css b/ckeditor/static/ckeditor/ckeditor/plugins/autosave/css/autosave.css
diff --git a/ckeditor/static/ckeditor/ckeditor/plugins/autosave/css/autosave.min.css b/ckeditor/static/ckeditor/ckeditor/plugins/autosave/css/autosave.min.css
diff --git a/ckeditor/static/ckeditor/ckeditor/plugins/autosave/js/difflib.js b/ckeditor/static/ckeditor/ckeditor/plugins/autosave/js/difflib.js
diff --git a/ckeditor/static/ckeditor/ckeditor/plugins/autosave/js/diffview.js b/ckeditor/static/ckeditor/ckeditor/plugins/autosave/js/diffview.js