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

853 Commits

Author SHA1 Message Date
Oskar Hahn b7a0e83c68 changed the main script 2012-08-14 14:19:59 +02:00
Oskar Hahn a2be848932 Merge branch 'master' into install 2012-08-13 19:35:14 +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 d0e7419666 Merge remote-tracking branch 'openslides/stable/1.2.x' 2012-08-13 18:36:23 +02:00
Oskar Hahn 5178363127 Merge pull request #6 from ostcar/translation 
Translation
 2012-08-13 09:30:17 -07: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 87af568eeb redesign the DeleteView 
Append a QuestionMixin to send a question via the django message api
 2012-08-10 21:00:13 +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
Norman Jäckel 3ba04e10b4 Fix typo in default permissions for anonymous-group 2012-08-10 00:37:23 +02:00
Oskar Hahn b19f6a7d74 Merge branch 'master' into install 
Conflicts:
	openslides/__init__.py
 2012-08-08 13:45:32 +02:00
Oskar Hahn 5353053d29 Merge branch 'stable/1.2.x' 
Conflicts:
	openslides/application/views.py
 2012-08-08 11:21:36 +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 f8f6e712a7 added LOCALE_PATHS to openslides_settings to avoid deprication in Django 1.5 2012-08-05 22:35:09 +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 008c743650 fixt #334. Let the anonymous user see the assignments by default 2012-08-05 11:58:11 +02:00
Oskar Hahn 998fb3e1ee fix #336. The admin could not edit the supporters from applications 2012-08-05 11:48:03 +02:00
Oskar Hahn 4873cd7163 fixted #330. Error if the related slide for an Agenda Item does not exists 2012-08-05 11:28:56 +02:00
Oskar Hahn bcd98301a9 remove mercurial_version from openslides.__init__ 2012-08-05 10:59:25 +02:00
Oskar Hahn feb1aa4138 make start.py script run again 2012-08-05 09:52:00 +02:00
Oskar Hahn e3f8bfcfd0 update setup.py to make an openslides module 2012-08-04 20:59:27 +02:00
Oskar Hahn 1a1bcb2358 updated some parts of OpenSlides to the new user-api 2012-08-04 15:15:11 +02:00
Oskar Hahn 465497ab30 some pep8 changes for the user-api 2012-08-04 14:47:09 +02:00
Oskar Hahn 72e41fe286 user-api: reorderd the user-api 2012-08-04 13:18:06 +02:00
Oskar Hahn fe1ebf806a user-api: Use the right Exception in get_user() 2012-08-04 12:51:07 +02:00
Oskar Hahn 8da09bb985 user-api: fix an error with deactivated supporters in application 2012-08-04 12:46:32 +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 2bc2dad7a5 user-api: small fix for the second poll in assignment 2012-08-03 19:15:14 +02:00
Oskar Hahn 8fcf65e829 user-api: make the assignments work with the new user-api 2012-08-03 18:56:00 +02:00
Oskar Hahn c16d38d9a3 user-api: Load the User-List from UserFormField on any request 2012-08-03 16:25:04 +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