From 2bfa5f3a7235af423704d2919137a3b45a7a7544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Mon, 19 May 2014 21:08:07 +0200 Subject: [PATCH] Prepared for release. Small style changes, CHANGELOG and README.rst update. --- CHANGELOG | 4 +++- README.rst | 4 +--- extras/win32-portable/licenses/django-ckeditor | 2 +- openslides/core/templates/form.html | 2 +- requirements_production.txt | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index e4e304018..48b24757a 100644 --- a/CHANGELOG +++ b/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. diff --git a/README.rst b/README.rst index 286ae4d7a..b71baef96 100644 --- a/README.rst +++ b/README.rst @@ -257,11 +257,9 @@ OpenSlides uses the following projects or parts of them: * `Bootstrap `_, License: Apache License v2.0 -* `CKEditor `_, License: GPL, LGPL, MPL - * `Django `_, License: BSD -* `Django CKeditor `_, License: BSD +* `Django CKEditor `_, License: BSD * `django-jsonfield `_, License: MIT diff --git a/extras/win32-portable/licenses/django-ckeditor b/extras/win32-portable/licenses/django-ckeditor index 3982829e5..fb62af2a2 100644 --- a/extras/win32-portable/licenses/django-ckeditor +++ b/extras/win32-portable/licenses/django-ckeditor @@ -21,4 +21,4 @@ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/openslides/core/templates/form.html b/openslides/core/templates/form.html index 36203f29a..649026782 100644 --- a/openslides/core/templates/form.html +++ b/openslides/core/templates/form.html @@ -1,4 +1,4 @@ -{{form.media}} +{{ form.media }} {% if form.non_field_errors %}
diff --git a/requirements_production.txt b/requirements_production.txt index 354a812c9..87adfc1b8 100644 --- a/requirements_production.txt +++ b/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