OpenSlides/openslides/utils
Oskar Hahn 139ba74459 Merge remote-tracking branch 'emanuel/newtemplate' into new_template
Conflicts:
	.travis.yml
	INSTALL.txt
	openslides/agenda/templates/agenda/base_agenda.html
	openslides/agenda/templates/agenda/edit.html
	openslides/agenda/templates/agenda/item_row.html
	openslides/agenda/templates/agenda/overview.html
	openslides/agenda/templates/agenda/widget.html
	openslides/assignment/templates/assignment/base_assignment.html
	openslides/assignment/templates/assignment/config.html
	openslides/assignment/templates/assignment/edit.html
	openslides/assignment/templates/assignment/overview.html
	openslides/assignment/templates/assignment/poll_view.html
	openslides/assignment/templates/assignment/view.html
	openslides/assignment/templates/assignment/widget.html
	openslides/config/templates/config/general.html
	openslides/motion/templates/motion/base_motion.html
	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/motion/templates/motion/widget.html
	openslides/motion/views.py
	openslides/participant/templates/participant/base_participant.html
	openslides/participant/templates/participant/config.html
	openslides/participant/templates/participant/edit.html
	openslides/participant/templates/participant/group_edit.html
	openslides/participant/templates/participant/group_widget.html
	openslides/participant/templates/participant/import.html
	openslides/participant/templates/participant/login.html
	openslides/participant/templates/participant/overview.html
	openslides/participant/templates/participant/password_change.html
	openslides/participant/templates/participant/settings.html
	openslides/participant/templates/participant/user_widget.html
	openslides/projector/templates/projector/base_projector.html
	openslides/projector/templates/projector/control_countdown.html
	openslides/projector/templates/projector/control_overlay_message.html
	openslides/projector/templates/projector/custom_slide_widget.html
	openslides/projector/templates/projector/live_view_widget.html
	openslides/projector/templates/projector/new.html
	openslides/projector/templates/projector/overlay_widget.html
	openslides/templates/base.html
	openslides/utils/template.py
	openslides/utils/views.py
	requirements.txt
2013-02-03 19:03:18 +01:00
..
auth cleanup 2012-11-24 14:01:21 +01:00
jsonfield Merged (conflicts). 2013-01-05 15:29:57 +01:00
person Handel null=True in PersonField 2013-02-02 21:19:37 +01:00
templatetags Save the submitters to the motion 2013-01-26 15:25:54 +01: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 Merged (conflicts). 2013-01-05 15:29:57 +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-tracking branch 'emanuel/newtemplate' into new_template 2013-02-03 19:03:18 +01:00
utils.py Reworked new template, especially agenda and dashboard. 2013-01-08 23:05:35 +01:00
views.py Merge remote-tracking branch 'emanuel/newtemplate' into new_template 2013-02-03 19:03:18 +01:00