René Köcher ed33b47666 Merge branch 'master' of ssh://ssh.github.com/OpenSlides/OpenSlides ... Conflicts: openslides/locale/de/LC_MESSAGES/django.po Signed-off-by: René Köcher <shirk@bitspin.org>		2012-11-22 12:52:11 +01:00
..
agenda	Fix perms for agenda, motion and assignment widget. It is now set to projector.can_manage_projector.	2012-11-21 15:14:38 +01:00
assignment	Fixed typo in identifier 'assignment_candidates'.	2012-11-21 20:12:08 +01:00
config	Removed frontpage and redirect '/' to dashboard url (because there is already a new welcome widget with the content of the frontpage on dashboard)	2012-11-17 22:14:49 +01:00
locale	Merge branch 'master' of ssh://ssh.github.com/OpenSlides/OpenSlides	2012-11-22 12:52:11 +01:00
motion	#419 - aftermath	2012-11-22 10:26:44 +01:00
participant	Reverted: Administrator can be deleted by other manager. (partly reverted 533c65562d after discus it with oskar because import also possible as non-admin)	2012-11-21 23:26:54 +01:00
poll	some fixes	2012-09-12 10:17:51 +02:00
projector	Removed unused widget file (duplicate of welcome_widget.html).	2012-11-21 23:05:38 +01:00
static	Enlarged users select box in new/edit group form.	2012-11-21 22:06:22 +01:00
templates	Updated translation for professional support footer.	2012-11-19 23:05:38 +01:00
utils	Removed frontpage and redirect '/' to dashboard url (because there is already a new welcome widget with the content of the frontpage on dashboard)	2012-11-17 22:14:49 +01:00
__init__.py	Prepared 1.3-beta2 release.	2012-11-07 22:21:55 +01:00
global_settings.py	Added new allowed language (French).	2012-11-07 22:24:39 +01:00
main.py	Pass along database path to create_settings if started as portable version	2012-11-09 13:45:52 +01:00
urls.py	Fix urls.py - Redirect from / to the dahsboard	2012-11-21 13:41:16 +01:00