OpenSlides/openslides/agenda
Norman Jäckel c13c0997bf Merge part of stable/1.5.x into master.
Conflicts:
	openslides/agenda/views.py
	openslides/mediafile/forms.py
	openslides/projector/api.py

The fix from commit 39de1924cb was removed
because of the new widget system in master branch. See GitHub Issue #1191
2014-04-05 15:19:42 +02:00
..
static Rename and clean up static direcories. 2014-01-14 23:27:12 +01:00
templates Reinserted icon and link for preview of agenda slide. Fixed #1199. 2014-01-31 01:02:12 +01:00
__init__.py Changes in projector and core app and in utils. 2014-01-10 16:17:54 +01:00
forms.py Translate state.name in motion log message. 2013-11-22 15:34:32 +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-12 13:38:07 +01: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 Rename and clean up static direcories. 2014-01-14 23:27:12 +01:00
slides.py Add function get_active_object and bugfixes 2013-11-25 11:35:03 +01:00
urls.py New API for widgets using a metaclass. 2013-12-01 21:30:12 +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