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

864 Commits

Author SHA1 Message Date
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