Oskar Hahn 424d10cb63 Merge remote-tracking branch 'norman/Some_Fixes_for_1_3_b1' ... Conflicts: openslides/__init__.py openslides/projector/views.py		2012-10-31 15:27:47 +01:00
..
static	rewrote participant status view as class based view	2012-08-10 19:19:41 +02:00
templates/participant	Enhence template of UserView and GroupView	2012-10-31 14:47:42 +01:00
__init__.py	added name for participant app in __init__	2012-07-19 11:11:07 +02:00
api.py	Fixed default password generation while CSV import.	2012-10-30 23:10:23 +01:00
forms.py	Updated translations (for sorting participants).	2012-10-30 22:59:37 +01:00
middleware.py	rename openslidesuser to user and openslidesgroup to group	2012-08-12 12:52:38 +02:00
models.py	Merge remote-tracking branch 'norman/Some_Fixes_for_1_3_b1'	2012-10-31 15:27:47 +01:00
tests.py	rename test_name_surfix in test_name_suffix in participant/tests.py	2012-10-29 16:27:15 +01:00
urls.py	Add UserView and GroupView part 2	2012-10-30 00:07:25 +01:00
views.py	Merge remote-tracking branch 'norman/Some_Fixes_for_1_3_b1'	2012-10-31 15:27:47 +01:00