OpenSlides/openslides/mediafile
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
..
static Changes in projector and core app and in utils. 2014-01-10 16:17:54 +01:00
templates Merge branch 'stable/1.5.x' 2014-01-11 22:30:14 +01:00
__init__.py Changes in projector and core app and in utils. 2014-01-10 16:17:54 +01:00
forms.py Enable update and delete view for uploader refering to his own files. 2013-12-03 01:53:37 +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 branch 'stable/1.5.x' 2014-01-11 22:30:14 +01:00
search_indexes.py Change to MIT Licence 2013-11-04 14:57:30 +01:00
slides.py Add function get_active_object and bugfixes 2013-11-25 11:35:03 +01:00
template.py Changes in projector and core app and in utils. 2014-01-10 16:17:54 +01:00
urls.py Change to MIT Licence 2013-11-04 14:57:30 +01:00
views.py Changes in projector and core app and in utils. 2014-01-10 16:17:54 +01:00
widgets.py New API for widgets using a metaclass. 2013-12-01 21:30:12 +01:00