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
..
static	Use single url for toggle publish/unpublish election ballots.	2012-05-20 20:02:36 +02:00
templates	Major changes for new twitter bootstrap template (e.g. replaced icons)	2013-01-31 10:19:56 +01:00
__init__.py	Add code	2011-07-31 10:46:29 +02:00
forms.py	cleanup	2012-11-24 14:01:21 +01:00
models.py	Reverted person.sort_name AttributeError fix (e0ce1052c0)	2012-11-27 22:54:07 +01:00
urls.py	Import urls.py needed django functions from django.conf.urls	2013-01-05 01:05:38 +01:00
views.py	Merge remote-tracking branch 'emanuel/newtemplate' into new_template	2013-02-03 19:03:18 +01:00