ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Prepared for release.
This commit is contained in:
Norman Jäckel 2014-05-19 23:01:52 +02:00
commit 141209efd4
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -10,6 +10,7 @@ Version 1.6 (unreleased)
Dashboard: Dashboard:
- Added shortcuts for the countdown. - Added shortcuts for the countdown.
- Enabled copy and paste in widgets.
Agenda: Agenda:
- New projector view with the current list of speakers. - New projector view with the current list of speakers.
- Added CSV import. - Added CSV import.
@ -50,7 +51,8 @@ Other:
- Renamed and cleaned up static direcories. - Renamed and cleaned up static direcories.
- Used jsonfield as required package. Removed jsonfield code. - Used jsonfield as required package. Removed jsonfield code.
- Added new package backports.ssl_match_hostname for portable build script. - 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. - Only reload the webserver in debug-mode.

4
README.rst
View File

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

2
extras/win32-portable/licenses/django-ckeditor
View File

@ -21,4 +21,4 @@ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

2
openslides/core/templates/form.html
View File

@ -1,4 +1,4 @@
{{form.media}} {{ form.media }}
{% if form.non_field_errors %} {% if form.non_field_errors %}
<div class="alert alert-error"> <div class="alert alert-error">
<button type="button" class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>

2
requirements_production.txt
View File

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