ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
a6fa8457cc
OpenSlides/openslides/core
History
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
..
management Change to MIT Licence 2013-11-04 14:57:30 +01:00
static Merge remote-tracking branch 'openslides/stable/1.5.x' 2014-03-12 19:29:22 +01:00
templates Move projector.models.ProjectorSlide to core.models.CustomSlide 2014-01-28 08:32:26 +01:00
templatetags Added AbsoluteUrlMixin and used it in any model. 2014-01-12 00:35:16 +01:00
__init__.py Move projector.models.ProjectorSlide to core.models.CustomSlide 2014-01-28 08:32:26 +01:00
forms.py Changes in projector and core app and in utils. 2014-01-10 16:17:54 +01:00
main_menu.py Move projector.models.ProjectorSlide to core.models.CustomSlide 2014-01-28 08:32:26 +01:00
models.py Move projector.models.ProjectorSlide to core.models.CustomSlide 2014-01-28 08:32:26 +01:00
signals.py Merge remote-tracking branch 'openslides/stable/1.5.x' 2014-03-12 19:29:22 +01:00
slides.py Move projector.models.ProjectorSlide to core.models.CustomSlide 2014-01-28 08:32:26 +01:00
urls.py Move projector.models.ProjectorSlide to core.models.CustomSlide 2014-01-28 08:32:26 +01:00
views.py Move projector.models.ProjectorSlide to core.models.CustomSlide 2014-01-28 08:32:26 +01:00
widgets.py Move projector.models.ProjectorSlide to core.models.CustomSlide 2014-01-28 08:32:26 +01:00