OpenSlides/openslides
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
..
account Inserted api for the personal info widget. 2013-12-09 12:16:16 +01:00
agenda Reinserted icon and link for preview of agenda slide. Fixed #1199. 2014-01-31 01:02:12 +01:00
assignment Inserted command line option to translate config strings during database setup. Fixed #460. 2014-01-31 02:03:43 +01:00
config Inserted command line option to translate config strings during database setup. Fixed #460. 2014-01-31 02:03:43 +01:00
core Merge remote-tracking branch 'openslides/stable/1.5.x' 2014-03-12 19:29:22 +01:00
locale Final update of all languages for 1.5: CS, DE, FR, PT. 2013-11-24 20:37:13 +01:00
mediafile Move projector.models.ProjectorSlide to core.models.CustomSlide 2014-01-28 08:32:26 +01:00
motion Merge remote-tracking branch 'openslides/stable/1.5.x' 2014-03-12 19:29:22 +01:00
participant Inserted command line option to translate config strings during database setup. Fixed #460. 2014-01-31 02:03:43 +01:00
poll Added a poll description field for each assignment poll 2014-01-12 10:22:38 +01:00
projector Merge remote-tracking branch 'openslides/stable/1.5.x' 2014-03-12 19:29:22 +01:00
utils Inserted command line option to translate config strings during database setup. Fixed #460. 2014-01-31 02:03:43 +01:00
__init__.py Update version to 1.6a1-dev. 2013-11-25 23:42:52 +01:00
__main__.py Inserted command line option to translate config strings during database setup. Fixed #460. 2014-01-31 02:03:43 +01:00
global_settings.py Used entry points to detect plugins automaticly. 2014-01-12 12:48:24 +01:00
urls.py Changes in projector and core app and in utils. 2014-01-10 16:17:54 +01:00