ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
274648b180
OpenSlides/openslides
History
Norman Jäckel 274648b180 Merge commit 'stable/1.7.x' into master. 
Conflicts:
	CHANGELOG
	openslides/__init__.py
	openslides/assignment/views.py
2015-02-25 13:26:49 +01:00
..
account Added Django's application configuration. 2014-12-10 17:16:58 +01:00
agenda Updated ViewSets to Django REST Framework 3.0.5. Refactored imports from openslides/utils/rest_api.py for better overriding them later. 2015-02-12 19:19:44 +01:00
assignment Updated ViewSets to Django REST Framework 3.0.5. Refactored imports from openslides/utils/rest_api.py for better overriding them later. 2015-02-12 19:19:44 +01:00
config Updated ViewSets to Django REST Framework 3.0.5. Refactored imports from openslides/utils/rest_api.py for better overriding them later. 2015-02-12 19:19:44 +01:00
core Added utils.views.CSRFMixin to append the csrf token to a view 2015-02-17 20:09:09 +01:00
locale Merge commit 'stable/1.7.x' into master. 2015-02-25 13:26:49 +01:00
mediafile Updated ViewSets to Django REST Framework 3.0.5. Refactored imports from openslides/utils/rest_api.py for better overriding them later. 2015-02-12 19:19:44 +01:00
motion Updated ViewSets to Django REST Framework 3.0.5. Refactored imports from openslides/utils/rest_api.py for better overriding them later. 2015-02-12 19:19:44 +01:00
poll Merge branch 'stable/1.6.x' into 'master'. 2015-01-02 22:11:56 +01:00
projector remove update_projector and add inform_changed_data 2015-01-17 15:16:49 +01:00
users Updated REST API for group create, update and delete. 2015-02-17 21:24:33 +01:00
utils Added utils.views.CSRFMixin to append the csrf token to a view 2015-02-17 20:09:09 +01:00
__init__.py Updated version to 1.7.1-dev 2015-02-15 20:48:02 +01:00
__main__.py Rework of management command 2015-01-23 15:40:12 +01:00
global_settings.py Implemented auth via AngularJS 2015-02-16 11:42:48 +01:00
urls.py Implemented auth via AngularJS 2015-02-16 11:42:48 +01:00