Emanuel Schuetze 247f6c9431 Merge remote branch 'upstream/master' into motiontemplate ... Conflicts: openslides/motion/models.py openslides/motion/views.py		2013-03-14 21:36:02 +01:00
..
agenda	Set new button als primary/blue button.	2013-03-09 14:17:30 +01:00
assignment	Set new button als primary/blue button.	2013-03-09 14:17:30 +01:00
config	Move builtin groups to a signal.	2013-03-12 20:58:22 +01:00
core	Built-in Workflows are created by listening to a signal which is sent after syncdb.	2013-03-11 21:32:09 +01:00
locale	Merge branch 'master' into agenda-orga-items	2013-02-11 22:36:19 +01:00
motion	Merge remote branch 'upstream/master' into motiontemplate	2013-03-14 21:36:02 +01:00
participant	Move builtin groups to a signal.	2013-03-12 20:58:22 +01:00
poll	Changed utils.- and poll.views	2013-02-01 12:51:01 +01:00
projector	Used custom build jquery-ui javascript components file. Integrated required jquery-ui styles (no remote link). Added used jquery components/addons to THANKS file.	2013-02-15 08:39:36 +01:00
static	Update motion templates to new template design. Added some missing model and view functions.	2013-03-11 18:26:22 +01:00
templates	Removed link to professional support in base template (footer).	2013-03-08 08:31:52 +01:00
utils	Merge branch 'master' of github.com:OpenSlides/OpenSlides into category	2013-03-12 22:05:20 +01:00
__init__.py	Update openslides/__init__.py	2013-01-04 11:49:43 +01:00
global_settings.py	Set new django setting. Put tornado code in a seperate file.	2013-02-27 18:54:06 +01:00
main.py	Move builtin groups to a signal.	2013-03-12 20:58:22 +01:00
urls.py	Fixed URLs in projector views	2013-02-02 00:26:08 +01:00