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
1719aa588d
rename some user api and participant names
2012-08-07 22:43:57 +02:00
c52f8f3ca7
changed application to motion and permitted to authorized in message-strings
2012-08-05 22:31:20 +02:00
14bf6d0a35
user-api: updated the application-supporter system to new user-api
2012-08-04 12:19:31 +02:00
4ffb701397
created new user-api
2012-08-03 00:11:53 +02:00
47a40150e6
added " befor permitted.
...
This changes a translation string
2012-07-28 11:01:57 +02:00
403f8e7917
update translation
2012-07-10 02:21:27 +02:00
8d961f4940
fix translation by using ugettext_lazy
2012-07-10 01:33:03 +02:00
f074cb5bfd
cleanup the imports of the application app
2012-07-08 09:21:39 +02:00
00eb365b91
rewrote active_slide in generic view
...
also reordert some imports
2012-07-01 15:35:05 +02:00
0a269ce601
help_text for the application config page
2012-06-30 16:28:15 +02:00
039446a7ca
#239 don't show supporters in application edit form, if there are not needed
2012-06-30 11:50:46 +02:00
018d53b3df
#236 , #244 make trivial_changes optional, and only in the edit form
2012-06-30 11:31:35 +02:00
6d3061f8af
cleaned poll pdf for assignment and application
2012-06-29 00:19:06 +02:00
3815ef26af
Fix wrong translations in forms/ models
...
Converted utils.translation_ex.ugettext to use ugettext_lazy and changed
forms modules to import ugettext from there (models where already importing
it from there)
2012-05-15 01:08:08 +02:00
7ef298881d
Updated license header.
2012-04-25 22:29:19 +02:00
189cfa1309
translate poll values
2012-04-17 17:35:50 +02:00
113d258b3d
#85 : New import option: set status of all imported applications to 'permit'
2012-04-13 21:55:13 +02:00
fb17b16fae
config pages in apps
2012-03-16 14:31:59 +01:00
8c597a2eb3
load form-css-classes from utils.forms.py instead to define it on every form
2012-02-20 18:44:02 +01:00
de62241dc7
Application: Added import ( #55 ) and trivial changes ( #56 ) function. Thanks to Rene Koecher!
2011-11-09 22:53:10 +01:00
6d7736d10d
Added new button in application view template to show agenda item of selected appliation (for manager only).
2011-11-01 14:35:58 +01:00
a23164a906
Order submitter and supporter fields by full name in ApplicationManagerForm.
2011-11-01 06:47:10 +01:00
3db6a12024
Add code
2011-07-31 10:46:29 +02:00
Oskar Hahn