156 Commits

Author	SHA1	Message	Date
Norman Jäckel	dcd8b7a639	Merge branch 'stable/1.6.x' into 'master'. ... Conflicts: CHANGELOG openslides/agenda/views.py openslides/assignment/views.py openslides/mediafile/views.py openslides/users/views.py openslides/utils/views.py tests/motion/test_pdf.py tests/settings.py	2015-01-02 22:11:56 +01:00
Norman Jäckel	4f04223e08	Added Django's application configuration. ... Used customized AppConfig classes in openslides.core, openslides.account, openslides.projector, openslides.agenda, openslides.motion, openslides.assignment, openslides.users, openslides.mediafile, openslides.config. Refactored loading of signals, template signals and slides.	2014-12-10 17:16:58 +01:00
Oskar Hahn	88222857bb	Use the new django transaction API ... fixes #1027	2014-10-19 10:52:48 +02:00
Oskar Hahn	5c6f7a41a8	Merge branch 'stable/1.6.x' ... Conflicts: tests/assignment/test_views.py	2014-10-18 08:53:51 +02:00
Oskar Hahn	c454faef94	Updated Django to 1.7.x	2014-10-14 17:14:52 +02:00
Oskar Hahn	3527b0a75b	Refactory of the participant app ... * New user model (used Django's AbstractBaseUser) * Renamed the app to users * removed person api See #861 Fixed #576 #478	2014-10-12 10:06:54 +02:00