Skip to content
This repository has been archived by the owner on Jan 19, 2022. It is now read-only.

Commit

Permalink
Remove ckeditor from repo except from build-config and update readme #43
Browse files Browse the repository at this point in the history
  • Loading branch information
Wtower committed Apr 6, 2016
1 parent ef2f603 commit 9f3f22d
Show file tree
Hide file tree
Showing 124 changed files with 578 additions and 543 deletions.
23 changes: 12 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,16 @@ coverage.xml
.venv

### Django
tests/media/ninecms/basic/image/*/
# Exclude all static files such as front-end libraries
ninecms/static/ninecms/*

# except ckeditor recommended build config
!ninecms/static/ninecms/ckeditor/
ninecms/static/ninecms/ckeditor/*
!ninecms/static/ninecms/ckeditor/build-config.js

# Libraries
ninecms/static/ninecms/bootstrap/
ninecms/static/ninecms/jquery/
ninecms/static/ninecms/jquery.scrollTo/
ninecms/static/ninecms/masonry/
ninecms/static/ninecms/video-js/
ninecms/static/ninecms/waypoints/
ninecms/static/ninecms/owl-carousel/
ninecms/static/ninecms/wow/
ninecms/static/ninecms/angular.min.js
# except NineCMS own images, js and css
!ninecms/static/ninecms/images/
!ninecms/static/ninecms/*.js
!ninecms/static/ninecms/*.css
tests/media/ninecms/basic/image/*/
7 changes: 7 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,13 @@ There is also a project that can be used as an

$ pip install -r requirements.txt

- Download CKEditor (optionally) for rich text fields in admin:

- Download from http://ckeditor.com/builder
- Extract files under ``static/ninecms/ckeditor`` so that ``ckeditor.js`` is in this directory
- A recommended ``build-config.js`` file is bundled in the above directory
- Note: the django-ckeditor package requires a similar action too, so it is not used.

3. Settings

All relevant settings sample also exist in ninecms/settings.py as comment.
Expand Down
30 changes: 29 additions & 1 deletion ninecms/static/ninecms/ckeditor/CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,34 @@
CKEditor 4 Changelog
====================

## CKEditor 4.5.8

New Features:

* [#12440](http://dev.ckeditor.com/ticket/12440): Added the [`config.colorButton_enableAutomatic`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-colorButton_enableAutomatic) option to allow hiding the "Automatic" option in the [color picker](http://ckeditor.com/addon/colorbutton).

Fixed Issues:

* [#10448](http://dev.ckeditor.com/ticket/10448): Fixed: Lack of scrollbar in the [right-to-left text direction](http://ckeditor.com/addon/bidi).
* [#12707](http://dev.ckeditor.com/ticket/12707): Fixed: The order of table elements does not comply with the HTML specification.
* [#13756](http://dev.ckeditor.com/ticket/13756): [Edge] Fixed: Context menus are cut-off.

## CKEditor 4.5.7

New Features:

* [#14327](http://dev.ckeditor.com/ticket/14327): Added Swiss German localization. Thanks to [Miro Grenda](https://twitter.com/mirogrenda)!

Fixed Issues:

* [#13816](http://dev.ckeditor.com/ticket/13816): Introduced a new strategy for Filling Character handling to avoid changes in DOM. This fixes the following issues:
* [#12727](http://dev.ckeditor.com/ticket/12727): [Blink] `IndexSizeError` when using the [Div Editing Area](http://ckeditor.com/addon/divarea) and [Content Templates](http://ckeditor.com/addon/templates) plugins.
* [#13377](http://dev.ckeditor.com/ticket/13377): [Widget](http://ckeditor.com/addon/widget) plugin issue when typing in Korean.
* [#13389](http://dev.ckeditor.com/ticket/13389): [Blink] [`editor.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData) fails when the cursor is next to an `<hr>` tag.
* [#13513](http://dev.ckeditor.com/ticket/13513): [Blink, WebKit] [Div Editing Area](http://ckeditor.com/addon/divarea) and [`editor.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData) throw an error when an image is the only data in the editor.
* [#13884](http://dev.ckeditor.com/ticket/13884): [Firefox] Fixed: Copying and pasting a table results in just the first cell being pasted.
* [#14234](http://dev.ckeditor.com/ticket/14234): Fixed: URL input field is not marked as required in the [Media Embed](http://ckeditor.com/addon/embed) dialog.

## CKEditor 4.5.6

New Features:
Expand Down Expand Up @@ -82,7 +110,7 @@ Other Changes:

New Features:

* [#13501](http://dev.ckeditor.com/ticket/13501): Added the [`config.fileTools_defaultFileName`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fileTools_defaultFileName) option to allow setting a default filen ame for paste uploads.
* [#13501](http://dev.ckeditor.com/ticket/13501): Added the [`config.fileTools_defaultFileName`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fileTools_defaultFileName) option to allow setting a default file name for paste uploads.
* [#13603](http://dev.ckeditor.com/ticket/13603): Added support for uploading dropped BMP images.

Fixed Issues:
Expand Down
4 changes: 2 additions & 2 deletions ninecms/static/ninecms/ckeditor/LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Software License Agreement
==========================

CKEditor - The text editor for Internet - http://ckeditor.com
Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.

Licensed under the terms of any of the following licenses at your
choice:
Expand Down Expand Up @@ -37,7 +37,7 @@ done by developers outside of CKSource with their express permission.

The following libraries are included in CKEditor under the MIT license (see Appendix D):

* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2015, CKSource - Frederico Knabben.
* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2016, CKSource - Frederico Knabben.
* PicoModal (included in `samples/js/sf.js`) - Copyright (c) 2012 James Frasca.
* CodeMirror (included in the samples) - Copyright (C) 2014 by Marijn Haverbeke <marijnh@gmail.com> and others.

Expand Down
2 changes: 1 addition & 1 deletion ninecms/static/ninecms/ckeditor/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CKEditor 4
==========

Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
http://ckeditor.com - See LICENSE.md for license information.

CKEditor is a text editor to be used inside web pages. It's not a replacement
Expand Down
2 changes: 1 addition & 1 deletion ninecms/static/ninecms/ckeditor/adapters/jquery.js

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

9 changes: 4 additions & 5 deletions ninecms/static/ninecms/ckeditor/build-config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand All @@ -13,10 +13,10 @@
* (1) http://ckeditor.com/builder
* Visit online builder to build CKEditor from scratch.
*
* (2) http://ckeditor.com/builder/e6189e713ba13f973aadf1f9be45be20
* (2) http://ckeditor.com/builder/0f20eddcb7463a55558fc4f293ca0dda
* Visit online builder to build CKEditor, starting with the same setup as before.
*
* (3) http://ckeditor.com/builder/download/e6189e713ba13f973aadf1f9be45be20
* (3) http://ckeditor.com/builder/download/0f20eddcb7463a55558fc4f293ca0dda
* Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
*
* NOTE:
Expand Down Expand Up @@ -99,7 +99,6 @@ var CKBUILDER_CONFIG = {
},
languages : {
'el' : 1,
'en' : 1,
'ru' : 1
'en' : 1
}
};
Loading

0 comments on commit 9f3f22d

Please sign in to comment.