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

1093 Commits

Author SHA1 Message Date
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
Oskar Hahn
4f61c763d7 started to rewrite the assignment-code for the new user-api 2012-08-03 13:49:05 +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
Oskar Hahn
e34f90aad1 update german translation 2012-07-28 11:09:00 +02:00
Oskar Hahn
47a40150e6 added " befor permitted. 
This changes a translation string
 2012-07-28 11:01:57 +02:00
Oskar Hahn
b2ce59080e #332 use an specific name for the session cookie 2012-07-27 23:18:31 +02:00
Oskar Hahn
ecfeb170f3 we can not redirect from a poll, that does not exists to an assignment. 2012-07-27 22:49:38 +02:00
Oskar Hahn
9a87db61cc #329 fix attribute error for anonymous users in the application view 2012-07-27 11:56:20 +02:00
Emanuel Schuetze
feb82bd531 Updated translation. 2012-07-25 23:21:30 +02:00
Emanuel Schuetze
8b39a4dfeb Hide div container of tabledrag to eleminate space between table and number of items. 2012-07-25 21:37:20 +02:00
Emanuel Schuetze
5d367dd635 Prepared 1.2 release. 2012-07-25 14:10:55 +02:00
Emanuel Schuetze
172b90ea1b #328: Translated application status error message. 2012-07-24 07:32:20 +02:00
Emanuel Schuetze
0c0f3d09da #328: Show error message if application status is already set. 2012-07-23 23:17:03 +02:00
Emanuel Schuetze
1f3cfaf25a Added ugettext_lazy for 403 error page. 2012-07-23 23:06:36 +02:00
Emanuel Schuetze
f3d656c98d #325: participant/passwords/print/ raises server-error 2012-07-23 23:03:42 +02:00
Emanuel Schuetze
f12d155651 Added linebreak. 2012-07-23 23:00:00 +02:00
Emanuel Schuetze
cdddc00d54 Improved else block. 2012-07-23 22:59:31 +02:00
Emanuel Schuetze
f36ad67bb9 Removed additional <hr> tag from custom slides widget. 2012-07-23 19:21:47 +02:00
Emanuel Schuetze
d58e8f4c84 Fixed filename of assignment poll pdf. 2012-07-23 12:58:46 +02:00
Emanuel Schuetze
bf5181e241 Fixed missing translation in PDF title and filename. 2012-07-23 12:57:47 +02:00
Emanuel Schuetze
219b1e936e Fixed two PDF build errors. 2012-07-23 12:35:15 +02:00
Oskar Hahn
9d2a011958 update translation 2012-07-23 09:33:19 +02:00
Oskar Hahn
797396d94d #322 remove the dot at the end of a assignment-model verbose-name 2012-07-23 09:30:34 +02:00
Emanuel Schuetze
0ce6627756 Fixed csv import error. 2012-07-23 08:55:05 +02:00
Norman Jäckel
e74e80299f Fix application links in the widgets. 2012-07-23 00:41:44 +02:00
Oskar Hahn
fedfe802e3 #315 remove 'application' from agenda/widget.html, too 2012-07-20 13:26:45 +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
Oskar Hahn
e1a2f18f74 #316 fix translation of the confirm message in the general config page 2012-07-20 11:31:28 +02:00
Oskar Hahn
e2d658b0d8 #321 change assignment string for the comment on the ballot paper 2012-07-20 11:24:34 +02:00
Oskar Hahn
ff4529d8eb #315 remove application from agenda by appending a new methode get_application_title_supplement 2012-07-20 11:22:09 +02:00
Oskar Hahn
078125a1a2 update translation 2012-07-20 11:05:04 +02:00
Oskar Hahn
0c834532db #317 change string for the automatic methode of choosind the right assignment-poll-methode 2012-07-20 10:59:34 +02:00
Oskar Hahn
469e93e21d rm beamer.html from agenda. created by merging the 1.2-dev branch in the default branch 2012-07-20 10:55:57 +02:00
Oskar Hahn
ba783489f2 changle end of line to windows for some files 2012-07-20 10:55:07 +02:00
Emanuel Schuetze
189d0bf5e1 Merged. 2012-07-19 14:55:58 +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
90905d3e53 Updated jquery from 1.7.1 to 1.7.2. 2012-07-19 08:45:48 +02:00
Emanuel Schuetze
7a9d475dae Updated css property border-radius. 2012-07-19 08:37:41 +02:00
Emanuel Schuetze
c678b557fa #311: Updated first login message and translations. 2012-07-19 08:21:51 +02:00
Emanuel Schuetze
7ff3d1382d #304: Added link to projector-view for non-admins 2012-07-19 07:54:49 +02:00
Emanuel Schuetze
4fe77f89d3 Updated translations. 2012-07-18 21:15:12 +02:00
Emanuel Schuetze
9b3103d4a8 #284: Updated i18n links and added gettext requirement note. 2012-07-18 20:44:02 +02:00
Oskar Hahn
8f4970e16c merge 1.2-dev with default branch 2012-07-18 10:37:23 +00:00
Oskar Hahn
365f844164 update translation 2012-07-18 10:53:19 +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
Emanuel Schuetze
db22ecfde8 Prepared 1.2-rc1 release. 2012-07-16 22:47:59 +02:00
Emanuel Schuetze
2a0e7ef2c4 Updated translation. 2012-07-16 22:37:59 +02:00
Emanuel Schuetze
0d3dcaf433 Merged. 2012-07-16 22:26:48 +02:00
Emanuel Schuetze
d428841735 Fixed translation. 2012-07-16 22:26:07 +02:00
Emanuel Schuetze
80d16a2852 Fixed missing error/condition ('candidate list already closed') for participants without manager permissions. 2012-07-16 22:21:23 +02:00
Oskar Hahn
fd6961234a set DEBUG=False in default.settings.py 2012-07-16 18:13:53 +02:00
Oskar Hahn
76e52cf01a #300 dont show votecast and voteinvalid symbols, if the vote has no votes 2012-07-16 14:29:30 +02:00
Oskar Hahn
4e5884bda4 #298 fix problem with a votecast of 0, -1 and -2 2012-07-16 14:10:56 +02:00
Oskar Hahn
07c4649243 #297 fix error in ApplicationPDF with changes in the poll API 2012-07-16 14:05:51 +02:00
Oskar Hahn
0b033271f8 fix some typos, mostly {%trans to {% trans 2012-07-16 14:00:29 +02:00
Norman Jäckel
5d5e7c10f5 Change strings in agenda overview and agenda widget concerning application items 2012-07-16 00:39:46 +02:00
Norman Jäckel
16e829a05d Change application widget - Set number behind the title. 
Fix wrong application title in the beamer template
 2012-07-16 00:12:12 +02:00
Norman Jäckel
0279c07b15 Change design of application view and poll view (see #292) 2012-07-16 00:01:26 +02:00
Norman Jäckel
bd9c609dc0 Change design of assignment poll view (see #292) 2012-07-15 23:17:10 +02:00
Norman Jäckel
bee6fa7147 Set initial value for posts in assingment. 2012-07-15 22:46:20 +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
a1152af7ea #288 fix type error if a poll has no votecast 2012-07-14 08:48:25 +02:00
Emanuel Schuetze
e4250b6ba1 Some style fixes. 2012-07-13 16:04:00 +02:00
Emanuel Schuetze
c8eb4d26d9 #232: Removed spaces from links via CSS. 2012-07-13 15:59:58 +02:00
Oskar Hahn
88cb44e0c3 #287 fix elected candidate in assignment-slide 2012-07-13 11:33:56 +02:00
Oskar Hahn
1b0a9b27ef #294 harmonize the name of the passwort settings page. 2012-07-13 11:24:41 +02:00
Oskar Hahn
66b853a10a redesign the poll api, so it don't creates poll-tables. Also, it is easier to get the poll for a vote object. 
#288 show percent after the vote results
 2012-07-13 11:16:06 +02:00
Emanuel Schuetze
969816be37 Use new close icon to keep old done icon. 2012-07-13 07:58:00 +02:00
Emanuel Schuetze
9c03726bef #295: Change link to button. 2012-07-13 07:44:42 +02:00
Emanuel Schuetze
b4ee5dfff4 #293: Updated translation. 2012-07-13 07:34:15 +02:00
Norman Jäckel
e99e5ab290 Clean up browsertitles (#282) in assignment and participant tab 2012-07-13 01:10:58 +02:00
Norman Jäckel
28d6fb54a7 Clean up browsertitles (#282) in config projector 2012-07-13 00:47:53 +02:00
Norman Jäckel
32c80caa37 Clean up browsertitles (#282) in agenda and application 2012-07-13 00:44:12 +02:00
Emanuel Schuetze
accb329a44 #232: Removed spaces from links. 2012-07-12 17:24:37 +02:00
Emanuel Schuetze
ed7221e0f0 Changed to other 'done' icon to better defferentiate the projector activate icon. 
Changed link help text.
 2012-07-12 17:17:53 +02:00
Emanuel Schuetze
0c64309c91 Rename summary icon. 2012-07-12 17:11:33 +02:00
Emanuel Schuetze
531f0d9abb Added link help text. 2012-07-12 17:02:59 +02:00
Emanuel Schuetze
7487cf1601 Set summary icon in agenda widget at the right side to other action 
icons.
 2012-07-12 16:57:23 +02:00
Oskar Hahn
e80b04504f #194 fix password when importing users via csv 2012-07-12 14:37:01 +02:00
Oskar Hahn
cea2bbbf7d update translation 2012-07-12 14:19:08 +02:00
Oskar Hahn
8cdcc95fd9 #286 import error in the agenda overview slide 2012-07-12 14:06:58 +02:00
Oskar Hahn
07a0d42577 #285 append tabs to password-change-view 2012-07-11 09:46:15 +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
Oskar Hahn
e22467b06e cleanup poll app 2012-07-10 11:48:03 +02:00
Oskar Hahn
01f0823ed7 cleanup the assignment app 2012-07-10 11:27:06 +02:00
Oskar Hahn
81fc7ae560 update translation 2012-07-10 02:53:49 +02:00
Oskar Hahn
85bddf6872 use "forname lastname" as default username, with a space 2012-07-10 02:50:42 +02:00
Oskar Hahn
96aca54f61 update user setting page 2012-07-10 02:46:00 +02:00
Oskar Hahn
403f8e7917 update translation 2012-07-10 02:21:27 +02:00
Norman Jäckel
25df1b8693 Deactivate the projector message overlay by default 2012-07-10 01:44:42 +02:00
Oskar Hahn
8d961f4940 fix translation by using ugettext_lazy 2012-07-10 01:33:03 +02:00
Oskar Hahn
333349a1f2 Only show voteresult-table where there is at least one published poll. 
Also fix AssignmentPDF-Poll-Table
 2012-07-10 00:47:00 +02:00
Andy Kittner
cd245e4605 Convert MEDIA_ROOT to unicode to avoid UnicodeWarning 2012-07-08 18:09:25 +02:00
Andy Kittner
5438b2c318 Add a workaround for django bug 18404 (fixes #204) 2012-07-08 18:09:23 +02:00
Oskar Hahn
f074cb5bfd cleanup the imports of the application app 2012-07-08 09:21:39 +02:00
Oskar Hahn
8feb195067 fix typo 2012-07-08 09:01:01 +02:00
Oskar Hahn
dc9dabff6d cleaned up the participant app. Sort of... 2012-07-07 15:26:00 +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
Oskar Hahn
eb3adcd8ca update translation 2012-07-07 11:20:30 +02:00
Oskar Hahn
f8a1c58fff #277 throw an error, in the invalid-field or the votecast-field is lower -2 2012-07-07 11:14:04 +02:00
Oskar Hahn
1889cff68b #276 fix unicode Error in html_string() function 2012-07-07 10:35:29 +02:00
Oskar Hahn
b0f561d429 realy fix lineend in assignment/view 2012-07-06 18:00:43 +02:00
Oskar Hahn
719d12e333 fix lineend in assignment/view.py 2012-07-06 17:56:17 +02:00
Norman Jäckel
e29cf868a5 Always hide Group in Assignment PDF vote_results-table 2012-07-06 15:37:22 +02:00
Norman Jäckel
e4367051df Hide "Reason" in Application PDF if there is none. 2012-07-06 15:30:14 +02:00
Norman Jäckel
59e6218a80 First Draft for Assignment PDF with fixed vote_results table. 2012-07-06 15:02:31 +02:00
Norman Jäckel
c1e9540699 Fix #280 2012-07-05 01:15:04 +02:00
Norman Jäckel
812d7a3c83 Fix #275 2012-07-05 00:23:42 +02:00
Oskar Hahn
ff44439351 #266 fix assignment view on the projector 2012-07-04 16:14:19 +02:00
Oskar Hahn
ef5b9e3281 #253 don't show unpublished polls for nonmanager in assignment view 2012-07-04 16:05:31 +02:00
Oskar Hahn
47ff052c22 fix close and unclose link via ajax 2012-07-04 15:49:33 +02:00
Oskar Hahn
b8a77e5abe rename passwort change page 2012-07-04 15:48:56 +02:00
Oskar Hahn
4e0f8670f1 update translation 2012-07-04 15:48:40 +02:00
Oskar Hahn
4eb4d2ee8d use s for sec in projector-control 2012-07-04 15:47:52 +02:00
Oskar Hahn
67426f239b only refresh the projector, if the content has changed 2012-07-04 15:00:08 +02:00
Oskar Hahn
7f2d10c9ca fix hide-closed-item function for non-manager 2012-07-04 13:12:07 +02:00
Oskar Hahn
76d2a33fc2 merge 2012-07-04 12:52:09 +02:00
Oskar Hahn
29d25d30d6 cleanup the agenda app 2012-07-04 12:50:33 +02:00
Oskar Hahn
a72832842b #267 fixt typo. 
syncdb is required
 2012-07-04 11:00:58 +02:00
Norman Jäckel
d654c268f7 Zusammenführen 2012-07-04 03:26:27 +02:00
Oskar Hahn
03fe1f84dd clear overlay-message via ajax 2012-07-04 03:21:03 +02:00
Norman Jäckel
a149d5a6bc Ticket #229 2012-07-04 03:19:42 +02:00
Oskar Hahn
ad8d5585f1 merge 2012-07-04 02:43:46 +02:00
Oskar Hahn
198eefbfdd rewrote projector overlay widget 2012-07-04 02:43:26 +02:00
Norman Jäckel
40c2bf481f Fix #240 2012-07-04 02:10:06 +02:00
Norman Jäckel
32a5b61da8 Insert type of an related item in the agenda widget as string behind the name 
of the item
 2012-07-04 00:55:37 +02:00
Norman Jäckel
ad02cb05ae Draft for vote result table on assignment view and projector. Publishing still not working. 2012-07-04 00:40:25 +02:00
Oskar Hahn
2dc0cc83f1 rewrote assignment poll output 2012-07-03 00:05:48 +02:00
Oskar Hahn
a21a96026b fix yes-no-abstain-poll in assigmnet-projector 2012-07-02 20:32:13 +02:00
Oskar Hahn
ebc81d9236 #255 fixed assignment-poll delete message 2012-07-01 17:38:34 +02:00
Oskar Hahn
8d4df3236b #243 fixt but, which created a second version for a new application 2012-07-01 17:20:02 +02:00
Oskar Hahn
e1d13e31ae #214 seperate page for password change 2012-07-01 16:56:01 +02:00
Norman Jäckel
68e26ff8c5 Fix #256 2012-07-01 16:48:44 +02:00
Norman Jäckel
acd9ba1fd1 Zusammenführen 2012-07-01 16:30:56 +02:00
Norman Jäckel
d22118ac72 Fix #252 2012-07-01 16:28:11 +02:00
Oskar Hahn
f903f350b8 insert item-summary link in the widget 2012-07-01 16:13:34 +02:00
Oskar Hahn
ff19e6d2c8 #247 summary of items for the projector 2012-07-01 16:10:26 +02:00
Oskar Hahn
00eb365b91 rewrote active_slide in generic view 
also reordert some imports
 2012-07-01 15:35:05 +02:00
Oskar Hahn
6c206fa740 #246 open activate slide view ajax 2012-07-01 11:07:04 +02:00
Oskar Hahn
ea4da31b0c rewrite projector_edit view as class based view 2012-07-01 10:52:08 +02:00
Oskar Hahn
2ba1b7e3bc rewrote countdown view as class based view 2012-07-01 10:44:41 +02:00
Oskar Hahn
0a269ce601 help_text for the application config page 2012-06-30 16:28:15 +02:00
Oskar Hahn
60570ea962 #245 update translation 2012-06-30 15:21:27 +02:00
Oskar Hahn
0f42dd06fd #234 take 75 chars at maximum 2012-06-30 14:50:52 +02:00
Oskar Hahn
aeb8a40875 fix typo in trivial changes 2012-06-30 14:50:14 +02:00
Norman Jäckel
c19118e774 Fix #230 2012-06-30 14:17:15 +02:00
Oskar Hahn
35e112a7d7 update translation 2012-06-30 12:24:23 +02:00
Oskar Hahn
fe7266097f #249 improve assignment PDF 2012-06-30 12:07:55 +02:00
Oskar Hahn
a48c63c132 #249 improve application pdf 2012-06-30 12:04:58 +02:00
Oskar Hahn
1b108603ea #239 don't show supporters in the application PDF, if they are disabled 2012-06-30 11:57:07 +02:00
Oskar Hahn
039446a7ca #239 don't show supporters in application edit form, if there are not needed 2012-06-30 11:50:46 +02:00
Oskar Hahn
018d53b3df #236, #244 make trivial_changes optional, and only in the edit form 2012-06-30 11:31:35 +02:00
Oskar Hahn
b9f783e9f1 #237 translate the related type 2012-06-30 11:06:32 +02:00
Oskar Hahn
e8e664b92e #237, #238 only show the first line of a comment in the agenda 2012-06-30 10:39:58 +02:00
Norman Jäckel
818a15aa2b Cf. #249 but now for assignments. 2012-06-29 11:52:23 +02:00
Norman Jäckel
aa30a1900b Short message on PDF if there are no applications (#249) 2012-06-29 11:42:28 +02:00
Norman Jäckel
cb2a4b9897 Application PDF: Fix #241 and insert version number 2012-06-29 11:22:47 +02:00
Oskar Hahn
09e6eec6f2 fix translation error in professional support 2012-06-29 00:38:34 +02:00
Oskar Hahn
587ce4093d update translation 2012-06-29 00:27:27 +02:00
Oskar Hahn
6d3061f8af cleaned poll pdf for assignment and application 2012-06-29 00:19:06 +02:00
Oskar Hahn
a00fe2b241 fix yesnoababstain in views.py 2012-06-28 22:49:02 +02:00
Oskar Hahn
4af19d091b remove elected users from an election. 2012-06-28 20:12:49 +02:00
Oskar Hahn
2fdbad55f1 rename AssignmentPoll.yesnoababstain in .yesnoabstain 2012-06-28 20:11:16 +02:00
Oskar Hahn
eafff30c49 fixe error in reverse calls 2012-06-28 20:10:48 +02:00
Norman Jäckel
3156c8b4b5 Turn on Yes-No-Abstain Ballot for Assignments/Elections, #108 2012-06-28 18:45:00 +02:00
Norman Jäckel
59fb053283 Fix #260 2012-06-28 01:14:51 +02:00
Norman Jäckel
409bfda353 Fix #257 2012-06-27 23:29:06 +02:00
Oskar Hahn
5311c7ae31 fix problem by the assignment-poll view 2012-06-24 23:31:06 +02:00
Oskar Hahn
6c66e55fc0 show right label for posts in new assignments 2012-06-24 22:38:42 +02:00
Oskar Hahn
4339c3ae8a allow to save an empty poll 2012-06-24 22:34:11 +02:00
Oskar Hahn
48c53d3cd0 link for creating an application agenda item in the sidebare 2012-06-24 22:21:46 +02:00
Oskar Hahn
3c04f6af82 translate poll options for assignments 2012-06-24 22:21:15 +02:00
Oskar Hahn
3e7e894d62 fix #250 don't allow assignments with not posts. 
But for the future, see #251
 2012-06-24 22:10:14 +02:00
Oskar Hahn
e9c680f5e1 update translation 2012-06-24 21:55:46 +02:00
Oskar Hahn
1a4e164dd2 refresh the projector only ones a second 2012-06-24 21:55:31 +02:00
Oskar Hahn
6a0bdb7aa2 the submitter of an application must not edit the application, after it was accepted 2012-06-24 21:52:21 +02:00
Oskar Hahn
391a10bb03 fix typo in frontpage_title 2012-06-23 15:42:25 +02:00
Oskar Hahn
b963b61385 update german translation 2012-06-23 15:36:02 +02:00
Oskar Hahn
7df1264abf rearange the userprofile. Only show first line from the user.profile.comment in the overview 2012-06-23 15:02:13 +02:00
Oskar Hahn
442a24ccd8 #222 fix to small db collumns for assignment.status and config.value 
db-reset necessary
 2012-06-23 13:17:50 +02:00
Norman Jäckel
4edc4f503c Edit Symbol in Application 2012-06-23 13:17:24 +02:00
Norman Jäckel
654388117b #208 and other symbol things 2012-06-23 13:14:18 +02:00
Oskar Hahn
cc42792a38 #164 call a assignmentpoll by this ballot number 2012-06-23 12:43:18 +02:00
Oskar Hahn
ae8876425a min value for polls is -2 2012-06-23 12:05:09 +02:00
Oskar Hahn
3d1e4f5489 #216 delete releated agenda-item, if the releated object (application or assignment) is deleted 2012-06-23 11:41:32 +02:00
Norman Jäckel
d110934f62 Insert title tag to Clean Message Button (#219) 2012-06-23 11:39:07 +02:00
Norman Jäckel
b1ed56176e Edit and View Links and Symbols in Widgets fixed (#206) 2012-06-23 10:43:01 +02:00
Oskar Hahn
b12ae6b0a0 #191 Create assignment-agenda Items 2012-06-23 10:27:58 +02:00
Oskar Hahn
f13ee5f409 make application tests run again 2012-06-19 10:50:55 +02:00
Norman Jäckel
a439794874 Insert Edit Symbol (Ticket 207) 2012-06-23 09:32:21 +02:00
Oskar Hahn
b6cb4223f2 #217 show agenda text again. 2012-06-19 10:19:43 +02:00
Oskar Hahn
e8bf2fce1a yes-no-abstain elections in assignments 2012-06-18 09:48:27 +02:00
Oskar Hahn
bf46342d17 #205 show Application number in projector Tab 2012-06-11 14:22:09 +02:00
Oskar Hahn
239f328372 rewrote projector-widget system 2012-06-11 13:43:48 +02:00
Oskar Hahn
960543b64e load all models in projector.views 2012-06-10 10:43:50 +02:00
Oskar Hahn
53dd1687ca fixed last commit 2012-06-10 10:11:38 +02:00
Oskar Hahn
cdef473491 fixe last commit 2012-06-10 10:08:04 +02:00
Oskar Hahn
bb816e0999 load config on each request 2012-06-09 19:39:52 +02:00
Emanuel Schuetze
2ce9815218 Prepared 1.2-beta3 release. 2012-06-06 16:40:05 +02:00
Emanuel Schuetze
a2e1b77bd6 #213 fixed (User settings form - remove User groups and active 
fields).
 2012-06-06 14:28:37 +02:00
Emanuel Schuetze
07a682c436 Set is_active for new participants to True. 2012-06-06 13:59:46 +02:00
Emanuel Schuetze
a6c220ca02 Reverted wrong testing code (for participants) from last commit. 2012-06-06 13:51:54 +02:00
Emanuel Schuetze
d8cd0c2b6a Renamed logo files (typo). 2012-06-04 10:17:56 +02:00
Oskar Hahn
43e30057b3 delete item, not application by releated agenda-items 2012-06-03 10:19:08 +02:00
Oskar Hahn
2e498403cb #167 fallback slide, if the slide does not exist 2012-06-03 09:43:28 +02:00
Oskar Hahn
965b682abc edit, delete, slide for releated item in agenda 2012-06-03 09:35:26 +02:00
Oskar Hahn
79893687f3 fixed error by activating a message, if it was only on a specific slide. 2012-06-03 09:05:12 +02:00
Andy Kittner
7e7ab210ab Set system url on first run (#211) 2012-05-31 00:27:47 +02:00
Andy Kittner
29057b8b87 Fix exceptions if project path contains non-utf8 characters (#204) 
Django converts byte strings in various places to unicode by decoding them from
utf-8, which will break if the filesystem encoding uses something else
(e.g. fileystem encoding is latin1 and the path contains german umlauts).

Avoid these problems by explicitly decoding all paths to unicode using an
appropriate encoding.
 2012-05-30 23:30:24 +02:00
Emanuel Schuetze
8cdc062628 Set version number back to dev mercurial revision 2012-05-25 09:34:50 +02:00
Emanuel Schuetze
f7eab29ed5 Fixed missing translation in poll_view assignment template (table head). 2012-05-23 14:31:12 +02:00
Emanuel Schuetze
0ab900cb7a Fixed missing permission of agenda submenu. 2012-05-23 14:30:42 +02:00
Emanuel Schuetze
279dade5c4 Fixed missing SITE_ROOT import. 2012-05-23 14:30:06 +02:00
Emanuel Schuetze
44c4fffc25 Added missing default TIME_ZONE in default.settings.py. 2012-05-23 14:29:11 +02:00
Emanuel Schuetze
0acf6734e9 Updated translations. 2012-05-21 22:02:55 +02:00
Emanuel Schuetze
7933dd2d5c Minor fixes. 2012-05-21 22:01:09 +02:00
Emanuel Schuetze
58fc689f14 Updated overlay message style in projector template. 2012-05-21 09:21:36 +02:00
Emanuel Schuetze
a737ef7300 Prepared 1.2-beta2 release. 2012-05-21 08:16:40 +02:00
Andy Kittner
0007a1dfa8 Add log messages when poll is updated/deleted (#187) 2012-05-20 23:12:50 +02:00
Emanuel Schuetze
37619b0a80 #114: Set participants tab inactive if usersettings page is active 2012-05-20 22:34:41 +02:00
Emanuel Schuetze
f8137da055 #203: Fixed highlighting more than one active line. 2012-05-20 22:20:17 +02:00
Emanuel Schuetze
5eb29ba9dd Fixed width of countdown input field. 2012-05-20 22:06:07 +02:00
Emanuel Schuetze
5581ed1222 #168: Improved countdown control buttons. 2012-05-20 22:01:44 +02:00
Emanuel Schuetze
92a64d38cf Add projector view link on front page. Fixed column for can_manage_projector permission. 2012-05-20 20:51:11 +02:00
Emanuel Schuetze
4389f5f548 #89: Added missing control_customslide.html template. 2012-05-20 20:15:49 +02:00
Emanuel Schuetze
c4450bf14e Updated translations. 2012-05-20 20:02:48 +02:00
Emanuel Schuetze
97bea50b03 Use single url for toggle publish/unpublish election ballots. 2012-05-20 20:02:36 +02:00
Emanuel Schuetze
9b6640c2ae Removed unused link var. 2012-05-20 19:44:29 +02:00
Emanuel Schuetze
406a2d18e3 Fixed can_manage_projector permission. 2012-05-20 19:43:38 +02:00
Emanuel Schuetze
189c975137 Use same url to toggle participant status. 2012-05-19 19:22:20 +02:00
Emanuel Schuetze
3a52cd56c6 #165: Use AJAX instead of page reload to publish assignment polls 2012-05-19 16:25:55 +02:00
Andy Kittner
fbc603b748 Fix initial value for pollform is value is a "special" value (#135) 2012-05-19 14:19:32 +02:00
Andy Kittner
182f20308b Fix exception in polls with special values (fallout from translation fix) 2012-05-19 13:41:30 +02:00
Andy Kittner
e005863336 Changed/ added logmessages for applications (#184, #187) 
- Added a logmessage when a version is accepted/ rejected

- Made logmessage for trivial changes more explicit and include
  the names of the changed fields

- Updated translations
 2012-05-19 12:46:54 +02:00
Andy Kittner
5aead54a0c Improve error message for failed logins (#199) 
While #199 was already closed I think passing on the original
error message is more userfriendly as it gives more details
what the actual error was (generates specific messages for
user inactive and disabled cookies)
 2012-05-19 10:48:29 +02:00
Andy Kittner
d3cf5c9311 Correctly handle first time passwords (#194) 
- Save User object after setting the password

- Only generate first time password if none was explicitly specified
 2012-05-19 10:33:59 +02:00
Emanuel Schuetze
3f4119f182 #199: Changed login error message. Updated translation. 2012-05-19 08:44:46 +02:00
Emanuel Schuetze
23fb97c7a2 #170: Use second submenu for agenda items. 2012-05-19 08:26:59 +02:00
Emanuel Schuetze
188fe4cce5 Fixed missing check for activeline in assignment overview. 2012-05-19 08:15:20 +02:00
Emanuel Schuetze
07c587a025 #186: Fixed published polls/ballot column on projector template. 2012-05-19 08:09:18 +02:00
Emanuel Schuetze
2dc156ef74 Automated merge with ssh://openslides.org/openslides 2012-05-18 23:25:51 +02:00
Emanuel Schuetze
f2a93c4505 #89: Delete custom slides. 2012-05-18 23:24:54 +02:00
Emanuel Schuetze
90787b2597 #89: Edit custom slides. 2012-05-18 23:07:09 +02:00
Andy Kittner
3f722d3b27 Add --insecure to runserver args in order to always server static files 
See: https://docs.djangoproject.com/en/1.4/ref/contrib/staticfiles/
 2012-05-18 22:34:59 +02:00
Emanuel Schuetze
ebe5381439 Automated merge with ssh://openslides.org/openslides 2012-05-18 19:38:26 +02:00
Emanuel Schuetze
b81469703b #198: Optimized submenu of application and assignment. 2012-05-18 19:38:21 +02:00
Emanuel Schuetze
c99deb8a2a Increase max_length of agenda title field. 2012-05-18 10:24:43 +02:00
Emanuel Schuetze
8ec3099620 #197: Rename the default User Group "Delegierte" to "Delegierter" 2012-05-17 22:03:48 +02:00
Emanuel Schuetze
4cef2762fe Fixed style in empty agenda overview table. 2012-05-17 21:38:37 +02:00
Emanuel Schuetze
0351627234 Fixed title in assignment projector template. 2012-05-17 21:36:18 +02:00
Emanuel Schuetze
ca2900e9d1 #195: Fixed unicode string in pdf header. 2012-05-17 21:34:19 +02:00