OpenSlides/openslides
Oskar Hahn cde6232477 Merge branch 'stable/1.5.x'
Conflicts:
	openslides/projector/projector.py
	openslides/templates/base.html
2014-01-11 22:30:14 +01:00
..
account Inserted api for the personal info widget. 2013-12-09 12:16:16 +01:00
agenda Merge branch 'stable/1.5.x' 2014-01-11 22:30:14 +01:00
assignment Changes in projector and core app and in utils. 2014-01-10 16:17:54 +01:00
config Changes in projector and core app and in utils. 2014-01-10 16:17:54 +01:00
core Changes in projector and core app and in utils. 2014-01-10 16:17:54 +01:00
locale Final update of all languages for 1.5: CS, DE, FR, PT. 2013-11-24 20:37:13 +01:00
mediafile Merge branch 'stable/1.5.x' 2014-01-11 22:30:14 +01:00
motion removed edit and view in get_absolute_view 2014-01-11 17:39:16 +01:00
participant Merge branch 'stable/1.5.x' 2014-01-11 22:30:14 +01:00
poll Rename some classes of the poll api. Clean up the poll api. 2013-12-07 00:24:11 +01:00
projector Merge branch 'stable/1.5.x' 2014-01-11 22:30:14 +01:00
static Merge branch 'stable/1.5.x' 2014-01-11 22:30:14 +01:00
templates Changes in projector and core app and in utils. 2014-01-10 16:17:54 +01:00
utils Merge branch 'stable/1.5.x' 2014-01-11 22:30:14 +01:00
__init__.py Update version to 1.6a1-dev. 2013-11-25 23:42:52 +01:00
__main__.py Fix start script help text. 2013-11-23 18:49:51 +01:00
global_settings.py Changes in projector and core app and in utils. 2014-01-10 16:17:54 +01:00
urls.py Changes in projector and core app and in utils. 2014-01-10 16:17:54 +01:00