Oskar Hahn
a6fa8457cc
Merge remote-tracking branch 'openslides/stable/1.5.x'
...
Conflicts:
extras/win32-portable/create_portable.txt
extras/win32-portable/prepare_portable.py
openslides/motion/templates/motion/motion_list.html
openslides/projector/templates/projector.html
requirements_production.txt
2014-03-12 19:29:22 +01:00
Emanuel Schuetze
13eb0ccb30
Fixed #1190 : Wrong sorting of motion identifier
...
- Added natural sorting JS plugin for motion DataTables (column identifier).
- Added the new requirements python package 'natsort' for natural sorting of motions in PDF.
2014-01-21 23:14:39 +01:00
Oskar Hahn
7f3162f17b
removed duplicated entry from the README.rst
...
See #1189
2014-01-17 16:05:49 +01:00
Emanuel Schuetze
d8d2ad002a
Rename and clean up static direcories.
...
- rename static subdirs to css and js
- move global static dir to core/static, changed
- move global templates dir to core/templates
- check comments and code style of all our own CSS and JS files
- minor changes related to the changes of template and static files
2014-01-14 23:27:12 +01:00
Oskar Hahn
90f9313faa
Use the jsonfield as requirement
2014-01-11 23:01:29 +01:00
Emanuel Schuetze
fa84c04492
Added used sphinx extention 'autoimage' to README.
...
Thanks to author Pedro Kroger who has allowed us to use it under MIT.
2013-11-25 20:18:17 +01:00
Emanuel Schuetze
b00911d1de
Updated README: Removed qrcode. Moved bootstrap.
2013-11-25 19:53:25 +01:00
Oskar Hahn
e2aecc4c4e
Mention django-jsonfield in the README.rst.
2013-11-06 16:53:57 +01:00
Oskar Hahn
0752d476e4
Change to MIT Licence
...
* Remove headers
* Changed lineendings to linux style in AUTHORS and CHANGELOG
2013-11-04 14:57:30 +01:00
Max Brauer
bd332bd3d5
added possibility to show pdfs on the projector
2013-10-29 22:05:11 +01:00
Oskar Hahn
47c60078b3
Use sockjs instead of only websocket
2013-10-27 20:50:10 +01:00
Norman Jäckel
37e6bfa008
Change link in install instruction (Setuptools). Fix #949 .
2013-10-22 17:39:20 +02:00
Norman Jäckel
f74cce96cb
Melt INSTALL.txt, THANKS and README.txt to new README.rst. Change metadate for portable version.
2013-10-21 19:46:52 +02:00
