Merge pull request #1305 from normanjaeckel/Prepare_Release_1.6b2

Prepared for release.

CHANGELOG

@@ -10,6 +10,7 @@ Version 1.6 (unreleased)
 
 Dashboard:
 - Added shortcuts for the countdown.
+- Enabled copy and paste in widgets.
 Agenda:
 - New projector view with the current list of speakers.
 - Added CSV import.
@@ -50,7 +51,8 @@ Other:
 - Renamed and cleaned up static direcories.
 - Used jsonfield as required package. Removed jsonfield code.
 - Added new package backports.ssl_match_hostname for portable build script.
-- Use app "django-ckeditor-updated" to render WYSIWYG HTML editors
+- Used new app "django-ckeditor-updated" to render WYSIWYG html editors.
+  Removed CKEditor from sources.
 - Only reload the webserver in debug-mode.
 
 

README.rst

@@ -257,11 +257,9 @@ OpenSlides uses the following projects or parts of them:
 * `Bootstrap <http://getbootstrap.com/2.3.2/>`_, License: Apache
   License v2.0
 
-* `CKEditor <http://ckeditor.com>`_, License: GPL, LGPL, MPL
-
 * `Django <https://www.djangoproject.com>`_, License: BSD
 
-* `Django CKeditor <https://github.com/riklaunim/django-ckeditor>`_, License: BSD
+* `Django CKEditor <https://github.com/riklaunim/django-ckeditor>`_, License: BSD
 
 * `django-jsonfield <https://github.com/bradjasper/django-jsonfield>`_,
   License: MIT

requirements_production.txt

@@ -2,6 +2,7 @@
 Django>=1.5,<1.7
 beautifulsoup4>=4.3,<4.4
 bleach>=1.2,<1.5
+django-ckeditor-updated>=4.2,<4.3
 django-haystack>=2.1,<2.2
 django-mptt>=0.6,<0.7
 jsonfield>=0.9,<0.10
@@ -12,7 +13,6 @@ setuptools>=2.1,<3.7
 sockjs-tornado>=1.0,<1.1
 tornado>=3.1,<3.3
 whoosh>=2.5.6,<2.6
-django-ckeditor-updated>=4.2,<4.3
 
 # For Python 2.6 support
 argparse==1.2.1