Emanuel Schuetze e101fb8212 Merge branch 'master' into agenda-orga-items ... Conflicts: openslides/agenda/static/styles/agenda.css openslides/agenda/templates/agenda/config.html openslides/agenda/templates/agenda/item_row.html openslides/agenda/templates/agenda/overview.html openslides/locale/de/LC_MESSAGES/django.mo openslides/locale/de/LC_MESSAGES/django.po openslides/static/styles/base.css requirements.txt		2013-02-11 22:36:19 +01:00
..
static	Merge branch 'master' into agenda-orga-items	2013-02-11 22:36:19 +01:00
templates	Merge branch 'master' into agenda-orga-items	2013-02-11 22:36:19 +01:00
__init__.py	Updated license header.	2012-04-25 22:29:19 +02:00
forms.py	Create items with duration loger than 23:59. Show start and end date. Duration has tooltip showing end date and time.	2013-02-05 16:36:57 +01:00
models.py	Create items with duration loger than 23:59. Show start and end date. Duration has tooltip showing end date and time.	2013-02-05 16:36:57 +01:00
slides.py	Item type changed from CharField to IntegerField. Constant type names added.	2013-02-01 15:13:40 +01:00
urls.py	Deprecated import django.conf.urls.defaults adjusted.	2013-01-05 12:39:20 +01:00
views.py	Merge branch 'master' into agenda-orga-items	2013-02-11 22:36:19 +01:00