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

164 Commits

Author SHA1 Message Date
Norman Jäckel 589c209c79 Merge branch 'master' into Version_String 
Conflicts:
	openslides/__init__.py
	openslides/config/views.py
 2012-11-28 17:54:29 +01:00
Oskar Hahn e7c47395bb Gave the empty user all the attributes it needs 2012-11-27 22:46:54 +01:00
Oskar Hahn 4dfd4ac67f fix _proper_unicode 2012-11-26 15:48:23 +01:00
Oskar Hahn bdfb714013 fixed pep8 in pdf.py 2012-11-26 10:35:29 +01:00
Oskar Hahn b3806d8cdd some tests for the agenda 2012-11-24 21:10:55 +01:00
Oskar Hahn bd32994296 cleanup 
Removed unused imports and fixed pep8 errors
 2012-11-24 14:01:21 +01:00
Oskar Hahn f5a438cf9f cleanup in utils 2012-11-24 01:42:10 +01:00
Norman Jäckel 4c97291598 Remove non-used revision template var. 2012-11-23 11:33:34 +01:00
Oskar Hahn 1dc7d45670 sort persons in motions 2012-11-22 17:00:09 +01:00
Oskar Hahn 8014f327a2 Merge branch 'master' of github.com:OpenSlides/OpenSlides into sort_person_api 2012-11-22 16:35:26 +01:00
Oskar Hahn fbf81e7780 sort persons 2012-11-22 16:19:09 +01:00
Emanuel Schuetze 27fa32b718 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
Emanuel Schuetze e338529865 #296: Localised the datetime in PDF header 2012-11-17 21:44:17 +01:00
Emanuel Schuetze 5623bb6888 Move professional support message into base template footer. 2012-11-08 19:13:31 +01:00
Oskar Hahn 79c5e93422 Redesigned the QuestioMixin 2012-10-28 19:59:41 +01:00
Oskar Hahn 7dcc2374f4 Merge remote-tracking branch 'openslides/master' into supporter 
Conflicts:
	openslides/application/urls.py
	openslides/motion/models.py
	openslides/motion/views.py
 2012-10-25 09:23:24 +02:00
Oskar Hahn 413cd27d40 fixed deletion of motions. #391 2012-10-24 12:45:40 +02:00
Oskar Hahn 3e1938941f Append a default class for the person-api. 
Also fixed the assignment-ballot-paper for group-persons
 2012-10-24 12:15:29 +02:00
Oskar Hahn c58d478151 rename render_to_forbitten to render_to_forbidden. #370 2012-10-24 11:39:27 +02:00
Oskar Hahn 681d909fa3 rename application to motion 2012-10-24 11:07:36 +02:00
Norman Jäckel c036be05bf Fix new class based view for support/unsupport motions. Fix strange error in QuestionMixin. 2012-10-23 11:54:18 +02:00
Oskar Hahn 2984fd791c small fix to the person api 2012-09-15 09:11:56 +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 cdf160dfc3 fix some problems with the creation of new users 2012-08-11 11:09:20 +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 ddb5756868 rewrote the participant edit view as class based view 2012-08-10 13:22:09 +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 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 14bf6d0a35 user-api: updated the application-supporter system to new user-api 2012-08-04 12:19:31 +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
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 1f3cfaf25a Added ugettext_lazy for 403 error page. 2012-07-23 23:06:36 +02:00
Emanuel Schuetze cdddc00d54 Improved else block. 2012-07-23 22:59:31 +02:00
Emanuel Schuetze 219b1e936e Fixed two PDF build errors. 2012-07-23 12:35:15 +02:00
Oskar Hahn 93f9e2dc97 fix error in the translation of the participant-list 2012-07-20 11:40:36 +02:00
Oskar Hahn 84a78e8584 #290 fix unicode problem for python 2.5 in strftime 2012-07-14 09:19:45 +02:00
Oskar Hahn 68215e78d6 add Licence for django-jsonfield 2012-07-11 09:45:48 +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
Oskar Hahn debaa505fb fix problems with reportlab and ugettext_lazy 2012-07-10 12:11:07 +02:00
Andy Kittner 5438b2c318 Add a workaround for django bug 18404 (fixes #204) 2012-07-08 18:09:23 +02:00
Oskar Hahn e01d456e7b clean up the config app. Use jsonfield to save the config values. 
Syncdb necessary.
 2012-07-07 14:48:21 +02:00
Oskar Hahn 15621b7702 clean up the projector App 2012-07-07 14:01:40 +02:00