57 Commits

Author	SHA1	Message	Date
Oskar Hahn	b232ed0c96	Merge pull request #1221 from emanuelschuetze/fix-1197 ... Fixed #1197: Use big heading for custom slides without text.	2014-04-27 21:08:18 +02:00
Emanuel Schütze	3b3597aa1f	Improved chatbox style. Updated jquery cookie and jquery ui. ... - Fixed js error on dashboard page if no cookie is found. - Use cookies only until end of session. For dashboard cookies use url /dashboard only. - Updated permission numbering of builtin groups and added can_use_chat permission. - Used minified version of jquery.cookie. - Added TODO comment for django session way from pull request.	2014-04-27 20:58:22 +02:00
Emanuel Schütze	d44f385ba8	Fixed #1197: Use big heading for custom slides without text. ... Keep last projector scale/scroll values after activate new slide.	2014-04-27 20:55:06 +02:00
Oskar Hahn	3d092f6dcc	countdown shortcuts	2014-04-27 19:48:57 +02:00
Norman Jäckel	e6dad6d087	Merge part of stable/1.5.x into master. ... Conflicts: CHANGELOG extras/win32-portable/create_portable.txt extras/win32-portable/prepare_portable.py openslides/__init__.py openslides/core/templates/base.html requirements_production.txt tests/config/test_config.py	2014-04-08 20:33:07 +02:00
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	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