ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
e6dad6d087
OpenSlides/openslides/core
History
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
..
management Change to MIT Licence 2013-11-04 14:57:30 +01:00
static Merge part of stable/1.5.x into master. 2014-04-08 20:33:07 +02:00
templates Merge part of stable/1.5.x into master. 2014-04-08 20:33:07 +02: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 Regrouped config collections and pages. Fixed #1201. 2014-03-13 00:41:57 +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