OpenSlides/openslides/utils
Emanuel Schuetze 4ae7f3e243 Merge remote branch 'upstream/master' into newtemplate
Conflicts:
	openslides/application/views.py
	openslides/assignment/templates/assignment/overview.html
	openslides/assignment/templates/assignment/view.html
	openslides/assignment/views.py
	openslides/locale/de/LC_MESSAGES/django.mo
	openslides/locale/de/LC_MESSAGES/django.po
	openslides/motion/templates/motion/config.html
	openslides/motion/templates/motion/edit.html
	openslides/motion/templates/motion/import.html
	openslides/motion/templates/motion/overview.html
	openslides/motion/templates/motion/poll_view.html
	openslides/motion/templates/motion/view.html
	openslides/participant/templates/participant/base_participant.html
	openslides/participant/templates/participant/config.html
	openslides/participant/templates/participant/group_edit.html
	openslides/participant/templates/participant/group_overview.html
	openslides/participant/templates/participant/overview.html
	openslides/projector/templates/projector/base_projector.html
	openslides/projector/templates/projector/dashboard.html
	openslides/projector/templates/projector/live_view_widget.html
	openslides/static/styles/base.css
	openslides/templates/base.html
	openslides/templates/front_page.html
	openslides/utils/utils.py
2013-01-02 23:01:43 +01:00
..
auth cleanup 2012-11-24 14:01:21 +01:00
jsonfield some tests for the agenda 2012-11-24 21:10:55 +01:00
person Gave the empty user all the attributes it needs 2012-11-27 22:46:54 +01:00
templatetags rename application to motion 2012-10-24 11:07:36 +02:00
__init__.py Add code 2011-07-31 10:46:29 +02:00
csv_ext.py cleanup 2012-11-24 14:01:21 +01:00
forms.py cleanup utils 2012-07-10 13:19:12 +02:00
modelfields.py cleanup 2012-11-24 14:01:21 +01:00
pdf.py fixed pep8 in pdf.py 2012-11-26 10:35:29 +01:00
signals.py Updated license header. 2012-04-25 22:29:19 +02:00
staticfiles.py cleanup utils 2012-07-10 13:19:12 +02:00
template.py Merge remote branch 'upstream/master' into newtemplate 2013-01-02 23:01:43 +01:00
utils.py Merge remote branch 'upstream/master' into newtemplate 2013-01-02 23:01:43 +01:00
views.py Merge remote branch 'upstream/master' into newtemplate 2013-01-02 23:01:43 +01:00