ag-admin
/
OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,074 Commits 6 Branches 42 Tags 64 MiB
Commit Graph

170 Commits

Author SHA1 Message Date
Oskar Hahn 9c031768f8 fix merge errors 2012-08-15 11:01:38 +02:00
Oskar Hahn b7a0e83c68 changed the main script 2012-08-14 14:19:59 +02:00
Oskar Hahn bd64a6cb5c Merge branch 'stable/1.2.x' 
Conflicts:
	openslides/application/models.py
	openslides/application/views.py
	openslides/participant/forms.py
	openslides/participant/views.py
 2012-08-13 19:16:42 +02:00
Oskar Hahn 31ca01563e some corrective actions 2012-08-13 14:37:49 +02:00
Oskar Hahn df40de67b0 rename openslidesuser to user and openslidesgroup to group 2012-08-12 12:52:38 +02:00
Oskar Hahn 0a8ee9cbad changed request.user to be the openslidesuser 2012-08-12 10:12:26 +02:00
Oskar Hahn 6795ccd25b change the users in the groupform 2012-08-11 11:36:55 +02:00
Oskar Hahn cdf160dfc3 fix some problems with the creation of new users 2012-08-11 11:09:20 +02:00
Oskar Hahn f01fe5a894 removed unused imports from participant and did some pep8 changes 2012-08-11 10:51:52 +02:00
Oskar Hahn bc3e7fdaab rewrote the group views as class based views 2012-08-11 10:09:54 +02:00
Oskar Hahn 9b3bec69d1 rewrote the passwort reset view as class base view 2012-08-10 21:24:26 +02:00
Oskar Hahn 1f2f7cc73a rewrote user csv import 
The import does not delete the existing users anymore, but append the users as new users.
 2012-08-10 19:49:46 +02:00
Oskar Hahn bb00eb3eb4 rewrote participant status view as class based view 2012-08-10 19:19:41 +02:00
Oskar Hahn 90fddba63b rewrote delete participant view as class based view 2012-08-10 13:29:46 +02:00
Oskar Hahn c029fe2f95 ix participant tests 2012-08-10 13:26:03 +02:00
Oskar Hahn ddb5756868 rewrote the participant edit view as class based view 2012-08-10 13:22:09 +02:00
Oskar Hahn 1832a0c125 make the openslides user a child model of the django user model 2012-08-10 13:11:10 +02:00
Oskar Hahn 29049119f7 rewrote participant overview as class based view 2012-08-10 11:51:45 +02:00
Oskar Hahn f008a4eb0a use OpenSlides.get_full_name instead of OpenSlides.user.get_full_name 2012-08-10 11:18:01 +02:00
Oskar Hahn 153482f32d first_name, last_name and name_surfix as OpenSlidesUser attributes 2012-08-10 11:14:11 +02:00
Oskar Hahn 75443808af fix some errors in participant 2012-08-08 10:52:13 +02:00
Oskar Hahn d1ab2f2e85 some pep8 corections for the participant app 2012-08-08 10:34:23 +02:00
Oskar Hahn f22362df9d made participant-test run again 2012-08-08 10:07:36 +02:00
Oskar Hahn 1719aa588d rename some user api and participant names 2012-08-07 22:43:57 +02:00
Oskar Hahn b55ceddb82 append tests for the participant app 2012-08-07 10:15:39 +02:00
Oskar Hahn ab33b9f05a fix error in application-supporters an assignment-candidates, for non admin users 2012-08-06 14:58:52 +02:00
Oskar Hahn c52f8f3ca7 changed application to motion and permitted to authorized in message-strings 2012-08-05 22:31:20 +02:00
Oskar Hahn 14bf6d0a35 user-api: updated the application-supporter system to new user-api 2012-08-04 12:19:31 +02:00
Oskar Hahn 1ae91d1130 changed user-api, so it can be filter the result for the prefix and the id 2012-08-03 14:23:13 +02:00
Oskar Hahn 93020f9ead mark group to be teated as user 2012-08-03 12:44:34 +02:00
Oskar Hahn 4ffb701397 created new user-api 2012-08-03 00:11:53 +02:00
Emanuel Schuetze f3d656c98d #325: participant/passwords/print/ raises server-error 2012-07-23 23:03:42 +02:00
Emanuel Schuetze bf5181e241 Fixed missing translation in PDF title and filename. 2012-07-23 12:57:47 +02:00
Oskar Hahn 93f9e2dc97 fix error in the translation of the participant-list 2012-07-20 11:40:36 +02:00
Oskar Hahn 8854f7f9ba #319 sort participants by there last_name by default 2012-07-20 11:34:37 +02:00
Norman Jäckel fd0f3d68fa Fix typo in participant/views.py 2012-07-19 12:27:45 +02:00
Oskar Hahn 834c30321b #310 Redirect to the password-change-page if the admin has not changed his password yet 2012-07-19 11:43:48 +02:00
Oskar Hahn f928abd006 merge 2012-07-19 11:16:38 +02:00
Oskar Hahn 70b161c539 added name for participant app in __init__ 
removed some files, added though branch merge
 2012-07-19 11:11:07 +02:00
Emanuel Schuetze c678b557fa #311: Updated first login message and translations. 2012-07-19 08:21:51 +02:00
Emanuel Schuetze 4fe77f89d3 Updated translations. 2012-07-18 21:15:12 +02:00
Oskar Hahn 9b8517faeb default value for the config value admin_password 2012-07-18 10:46:26 +02:00
Oskar Hahn b327d41ee6 #306 show admin password if it hasn't changed 2012-07-18 10:46:07 +02:00
Oskar Hahn 0b033271f8 fix some typos, mostly {%trans to {% trans 2012-07-16 14:00:29 +02:00
Oskar Hahn 1b0a9b27ef #294 harmonize the name of the passwort settings page. 2012-07-13 11:24:41 +02:00
Norman Jäckel e99e5ab290 Clean up browsertitles (#282) in assignment and participant tab 2012-07-13 01:10:58 +02:00
Oskar Hahn e80b04504f #194 fix password when importing users via csv 2012-07-12 14:37:01 +02:00
Oskar Hahn 07a0d42577 #285 append tabs to password-change-view 2012-07-11 09:46:15 +02:00
Oskar Hahn aa130ab2da cleanup openslides base files. 
Do not manipulate the pythonpath anymore.
 2012-07-10 14:00:51 +02:00
Oskar Hahn 5fcef8aba4 cleanup utils 2012-07-10 13:19:12 +02:00