OpenSlides/openslides/motion
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
..
static/css Rename and clean up static direcories. 2014-01-14 23:27:12 +01:00
templates Merge remote-tracking branch 'openslides/stable/1.5.x' 2014-03-12 19:29:22 +01:00
__init__.py Changes in projector and core app and in utils. 2014-01-10 16:17:54 +01:00
csv_import.py Improved #1023 - Motion csv import: Collect all warnings and errors in one message. 2013-11-18 17:21:21 +01:00
exceptions.py Change to MIT Licence 2013-11-04 14:57:30 +01:00
forms.py Change to MIT Licence 2013-11-04 14:57:30 +01:00
main_menu.py Changes in projector and core app and in utils. 2014-01-10 16:17:54 +01:00
models.py Merge part of stable/1.5.x into master. 2014-04-05 15:19:42 +02:00
pdf.py Correctly handle nested lists in the motion PDF 2014-03-31 22:07:14 +02:00
personal_info.py Inserted api for the personal info widget. 2013-12-09 12:16:16 +01:00
search_indexes.py Change to MIT Licence 2013-11-04 14:57:30 +01:00
signals.py Regrouped config collections and pages. Fixed #1201. 2014-03-13 00:41:57 +01:00
slides.py Change to MIT Licence 2013-11-04 14:57:30 +01:00
urls.py Change to MIT Licence 2013-11-04 14:57:30 +01:00
views.py Merge part of stable/1.5.x into master. 2014-04-05 15:19:42 +02:00
widgets.py Move projector.models.ProjectorSlide to core.models.CustomSlide 2014-01-28 08:32:26 +01:00