OpenSlides/openslides
Oskar Hahn 0cf0e58af9 Merge branch 'master' of git://github.com/emanuelschuetze/OpenSlides
Conflicts:
	openslides/assignment/models.py
2012-09-13 15:28:35 +02:00
..
agenda translate agenda hidden filter in js 2012-09-13 15:21:43 +02:00
application clarify the submitter name in the application pdf 2012-09-13 12:16:46 +02:00
assignment Merge branch 'master' of git://github.com/emanuelschuetze/OpenSlides 2012-09-13 15:28:35 +02:00
config Merge pull request #6 from ostcar/translation 2012-08-13 09:30:17 -07:00
locale Merge branch 'master' of git://github.com/emanuelschuetze/OpenSlides 2012-09-13 15:28:35 +02:00
participant dont use simular passwords in gen_password (no Il10oO) 2012-09-13 11:50:06 +02:00
poll some fixes 2012-09-12 10:17:51 +02:00
projector Updated translations. 2012-09-11 20:50:53 +02:00
static Hide div container of tabledrag to eleminate space between table and number of items. 2012-07-25 21:37:20 +02:00
templates fix some typos, mostly {%trans to {% trans 2012-07-16 14:00:29 +02:00
utils some corrective actions 2012-08-13 14:37:49 +02:00
__init__.py Merge branch 'master' into install 2012-08-08 13:45:32 +02:00
main.py Remove a few spaces for pep8 conformance 2012-08-28 19:07:40 +02:00
openslides_global_settings.py Name openslides_personal_settings.py and openslides_global_settings.oy 2012-08-24 14:23:12 +02:00
urls.py rename openslidesuser to user and openslidesgroup to group 2012-08-12 12:52:38 +02:00