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
..
agenda	Merge branch 'master' into agenda-orga-items	2013-02-11 22:36:19 +01:00
assignment	Merge remote-tracking branch 'emanuel/newtemplate' into new_motion	2013-02-06 09:25:27 +01:00
config	Updated some views for the new utils.views style	2013-02-03 19:43:36 +01:00
locale	Merge branch 'master' into agenda-orga-items	2013-02-11 22:36:19 +01:00
motion	fixed pep8	2013-02-06 09:34:44 +01:00
participant	Merge remote-tracking branch 'emanuel/newtemplate' into new_motion	2013-02-06 09:25:27 +01:00
poll	Changed utils.- and poll.views	2013-02-01 12:51:01 +01:00
projector	Merge remote-tracking branch 'emanuel/newtemplate' into new_motion	2013-02-06 09:25:27 +01:00
static	template: Added new css class for minimum column width.	2013-02-05 22:03:43 +01:00
templates	template: minor style changes	2013-02-05 23:42:30 +01:00
utils	Merge remote-tracking branch 'emanuel/newtemplate' into new_motion	2013-02-06 09:25:27 +01:00
__init__.py	Merged (conflicts).	2013-01-05 15:29:57 +01:00
global_settings.py	Add workflows for motions	2013-02-01 16:33:45 +01:00
main.py	Add an option to suppress starting of web browser (closes #436)	2013-01-22 21:04:07 +01:00
urls.py	Fixed URLs in projector views	2013-02-02 00:26:08 +01:00