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

279 Commits

Author SHA1 Message Date
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
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
b963b61385 update german translation 2012-06-23 15:36:02 +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
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
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
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
Norman Jäckel
a439794874 Insert Edit Symbol (Ticket 207) 2012-06-23 09:32:21 +02:00
Oskar Hahn
e8bf2fce1a yes-no-abstain elections in assignments 2012-06-18 09:48:27 +02:00
Oskar Hahn
239f328372 rewrote projector-widget system 2012-06-11 13:43:48 +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
279dade5c4 Fixed missing SITE_ROOT import. 2012-05-23 14:30:06 +02:00
Emanuel Schuetze
7933dd2d5c Minor fixes. 2012-05-21 22:01:09 +02:00
Emanuel Schuetze
97bea50b03 Use single url for toggle publish/unpublish election ballots. 2012-05-20 20:02:36 +02:00
Emanuel Schuetze
3a52cd56c6 #165: Use AJAX instead of page reload to publish assignment polls 2012-05-19 16:25:55 +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
b81469703b #198: Optimized submenu of application and assignment. 2012-05-18 19:38:21 +02:00
Emanuel Schuetze
0351627234 Fixed title in assignment projector template. 2012-05-17 21:36:18 +02:00
Andy Kittner
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
Emanuel Schuetze
bc9765230c #185: Wrong permission to print assignments. 2012-05-14 22:02:45 +02:00
Emanuel Schuetze
d8807ba979 #180: Ballot description. Fixed ballot number function. 2012-05-14 21:34:46 +02:00
Emanuel Schuetze
79605531c5 Some minor style fixes for poll view templates. 2012-04-29 19:12:18 +02:00
Emanuel Schuetze
4e8e9b5407 #155: Remove header/footer in frameless PDF. 2012-04-29 18:54:42 +02:00
Emanuel Schuetze
dd10a59533 #109: New second submneu for election view. 2012-04-28 23:10:19 +02:00
Emanuel Schuetze
804c3da59a Updated tranlation string. 2012-04-27 08:02:01 +02:00
Emanuel Schuetze
3bcf4fd9c3 Added missing 'required' helptext to all forms. 2012-04-26 17:50:46 +02:00
Emanuel Schuetze
9b6b969f8a Added missing license header (for js and css). 2012-04-25 22:48:27 +02:00
Emanuel Schuetze
7ef298881d Updated license header. 2012-04-25 22:29:19 +02:00
Emanuel Schuetze
719ea6ec79 #93: Show application number in header of projector template. 
Some more projetor style work.
 2012-04-24 22:27:16 +02:00
Emanuel Schuetze
d56dcba7d4 #119: Adjusted icon filenames. 2012-04-23 21:27:22 +02:00
Emanuel Schuetze
81a0c9661e #119: Adjusted some icon filenames. 2012-04-23 08:07:21 +02:00
Emanuel Schuetze
61b9d476ab Set default config values. 2012-04-22 16:55:16 +02:00
Emanuel Schuetze
039bd4121c Some assignment poll template fixes. 2012-04-21 22:27:11 +02:00
Emanuel Schuetze
61d4d1ca2f #136: Fixed missing polls in projector view 2012-04-21 21:38:59 +02:00
Emanuel Schuetze
f711f96265 #107: New actions column for elections. 2012-04-20 22:58:34 +02:00
Emanuel Schuetze
7a6eaf2660 Fixed building AssignmentPollPDF. 2012-04-20 14:33:40 +02:00
Oskar Hahn
9f70b2ff1c rename ballout def in application and assignment 2012-04-18 19:02:41 +02:00
Emanuel Schuetze
040b5ffb45 Fixed #125: Assignment PDF: Invalid votes and votes cast doesn't support special values '-1' and '-2'. 2012-04-17 21:16:55 +02:00
Oskar Hahn
a3808c7b30 fixed problem in assignment poll 2012-04-15 14:58:05 +02:00
Emanuel Schuetze
95d5929449 Added participant and version config page. Moved system settings to general. Some style work. 2012-04-15 12:39:28 +02:00
Emanuel Schuetze
8149686a04 Updated German translation from "Benutzergruppe" to "Benutzerrolle". Some translation fixes. 2012-04-15 09:48:01 +02:00
René Köcher
e9ad4de11f Minor template fix.. 2012-04-14 22:45:33 +02:00
René Köcher
aef2a08666 Minor template fixes. 2012-04-14 22:41:02 +02:00
Emanuel Schuetze
09d2c3112d Minor fixes. 2012-04-14 19:14:51 +02:00
Oskar Hahn
92d2b1db60 ballot methode for AssignmentPoll and ApplicationPoll 2012-04-14 17:09:15 +02:00
René Köcher
f674897505 Split static files in application specific directories and use django 1.4 staticfiles app. 2012-04-14 14:51:56 +02:00
Oskar Hahn
fbdcc5e0b4 Automated merge with ssh://openslides.de/openslides 2012-04-14 14:31:15 +02:00
Oskar Hahn
535795391d remove default permission after syncdb 2012-04-14 14:31:09 +02:00
Emanuel Schuetze
1528ab90c6 Merged. 2012-04-14 14:27:31 +02:00
Emanuel Schuetze
d192ac4952 Added AssignmentPollDelete View. Moved Assignment pdf functions to assignment's views.py 2012-04-14 14:24:13 +02:00
Oskar Hahn
6f377453bc rename system in config. Add default config in each apps 2012-04-14 12:52:56 +02:00
Oskar Hahn
491c65cf24 use app name for projector category 2012-04-14 11:18:47 +02:00
René Köcher
7e12e1d5e2 Support for localized permissions on top of the untranslated django model. 2012-04-14 09:28:28 +02:00
Emanuel Schuetze
a1c5766e7a Adjusted app prefix in urls.py (outsource in global urls.py). Some code formatting. 2012-04-13 21:43:16 +02:00
Oskar Hahn
bb430fd2a7 remove admin, add plugin system for openslides 2012-04-13 14:05:51 +02:00
Oskar Hahn
d187f341b3 DeleteView in utils.views 2012-04-12 20:11:05 +02:00
Oskar Hahn
9e6aa796ab fixed error in emty poll in assignment 2012-04-12 16:37:04 +02:00
Emanuel Schuetze
c2ec9e958f #79: Merged fix of r361 from default branch into 1.2-dev branch. 2012-04-02 08:30:28 +02:00
Emanuel Schuetze
a11ed6cfdb Minor template fixes. 2012-03-22 17:30:02 +01:00
Oskar Hahn
c4c42611b4 generate tab liste by app list 2012-03-18 17:11:58 +01:00
Oskar Hahn
fb17b16fae config pages in apps 2012-03-16 14:31:59 +01:00
Oskar Hahn
2947fff9f6 commit mailinglist test 2012-03-12 18:27:13 +01:00
Emanuel Schuetze
55c4299a7f Updated projector control template. Fixed some slidemodel strings and urls. 
Updated jquery to 1.7.1. Added jquery-ui.
 2012-03-06 08:19:49 +01:00
Oskar Hahn
a25d980f92 publish assignment polls 2012-03-03 11:16:10 +01:00
Oskar Hahn
654b101dac beamer setting page 2012-03-03 09:11:56 +01:00
Emanuel Schuetze
c14dcb1679 Added missing template tags (i18n). 2012-02-21 08:21:59 +01:00
Oskar Hahn
8c597a2eb3 load form-css-classes from utils.forms.py instead to define it on every form 2012-02-20 18:44:02 +01:00
Oskar Hahn
70f1cb8b3e use the new poll-api in assignments 2012-02-19 19:27:00 +01:00
Oskar Hahn
0957de83a9 start to rewrite the poll-api 2012-02-14 16:31:21 +01:00
Oskar Hahn
6498095e2b create setup.py to install openslides 2012-02-09 16:57:10 +01:00
Oskar Hahn
8c27c731f8 rename Element to Slide 2012-02-06 22:22:16 +01:00
Oskar Hahn
16c37661f7 renamed beamer in projector 2012-02-06 22:08:08 +01:00
Oskar Hahn
5f6c96b3e8 assignment and application can be beamt without a item-element 2012-02-03 23:12:28 +01:00
Emanuel Schuetze
72de1dce74 Fixed missing form invalid error message. 2011-11-24 19:42:32 +01:00
Emanuel Schuetze
69befddc90 Added incompleted unit tests from changeset 247 for ongoing work of next release. 2011-11-17 17:06:39 +01:00
Emanuel Schuetze
3ae853f082 Removed incompleted unit tests for 1.1 release. 2011-11-14 22:54:31 +01:00
Emanuel Schuetze
eb35289e4e Fixed #57: <button> inside <a> tag not working in IE.; Added new icon for anonymous login. 2011-11-14 19:33:45 +01:00
Emanuel Schuetze
f26a19036b Added new button in assignment view template to show agenda item of selected assignment (for manager only). 2011-11-01 14:45:24 +01:00
Emanuel Schuetze
34f76c8c28 #27: Added default sort for assignments and participants. 2011-10-05 21:35:20 +02:00
Emanuel Schuetze
b76c4d8ecf Opened add-user-url in new tab. 2011-09-29 22:36:21 +02:00
Emanuel Schuetze
f85ebbfab9 Fixed active submenu class. Added submenu icon for generate passwords. Updated translation. 2011-09-12 09:06:24 +02:00
Emanuel Schuetze
e640241154 Updated translations. Fixed style and display of votes invalid, votes cast. 2011-09-11 22:43:15 +02:00
Oskar Hahn
d32fe2902d Automated merge with ssh://oshahn.de/openslides 2011-09-09 22:25:23 +02:00
Oskar Hahn
08a3cf8490 allow undocumented votecast and voteinvalid 
the poll-class has two new properties. voteinvalidf and votescastf. They show
undocumented if the value is -2, else the value
 2011-09-09 22:23:42 +02:00
Emanuel Schuetze
9de5e25ae1 Automated merge with ssh://openslides.org/openslides 2011-09-09 16:34:33 +02:00
Emanuel Schuetze
1e248ebf23 Only show published polls for normal users. 2011-09-09 16:34:01 +02:00
Oskar Hahn
7fc12e51f9 type in last commit, template update, form update 
info in template, that -1 is majority and -2 in undocumentet

update option_form. -2 is a valide value
 2011-09-09 16:26:34 +02:00
Emanuel Schuetze
91049155a6 Print election results in pdf. Fixed redirect. 2011-09-09 16:18:11 +02:00
Emanuel Schuetze
85d61d38e5 Added publish/unpublish icon. 2011-09-08 16:39:41 +02:00
Emanuel Schuetze
5a3f336cdf Added "published" attribute for poll object. Adjusted assignment 
views and templates.
 2011-09-08 12:30:34 +02:00
Emanuel Schuetze
c53e5267c5 Updated translations. 2011-09-07 22:46:47 +02:00
Emanuel Schuetze
3001b9f474 Layout fix for pdf assignment icon. 2011-09-07 22:03:04 +02:00
Emanuel Schuetze
fa71a1236d Count numbers of application, assignments and participants. Some minor style fixes. 2011-09-07 19:35:06 +02:00
Emanuel Schuetze
5fd31f6ca6 Added assignment pdf. 2011-09-07 07:52:44 +02:00
Oskar Hahn
08a1e88e12 newest version link for application 2011-09-06 10:41:06 +02:00
Oskar Hahn
31550a4ca7 database way for the last commit 2011-09-06 10:07:51 +02:00
Oskar Hahn
b14742205b unique candidates in assignments if there are more then one ballot 2011-09-06 09:40:48 +02:00
Emanuel Schuetze
cdfb6b24e3 Mark elected candidates in beamer view. 2011-09-06 07:33:13 +02:00
Emanuel Schuetze
8cd0ac8778 Added icon and style information for elected/not elected candidates. 2011-09-05 23:13:18 +02:00
Emanuel Schuetze
f412e9065a Needs fix to group candidates by user. 2011-09-05 21:40:56 +02:00
Emanuel Schuetze
0b17ab10fe Fixed candidates order in beamer view. Some style changes. 2011-09-05 20:47:55 +02:00
Emanuel Schuetze
fec269e4a7 Fixed alphabetical order of candidates. 2011-09-05 20:27:47 +02:00
Emanuel Schuetze
d1d0e7e9b4 Updated permissions. 2011-09-04 12:21:58 +02:00
Emanuel Schuetze
ceb9a3b4c3 PDF: Optimized ballot description for 2 lines. 2011-09-03 23:38:14 +02:00
Emanuel Schuetze
2ad0754f88 Added and fixed apply buttons. Updated translation. 2011-09-03 19:25:05 +02:00
Emanuel Schuetze
021fb27833 Added apply buttons. Some style changes. Fix permissions. 2011-09-03 16:20:10 +02:00
Emanuel Schuetze
a874e327ac Fixed style. 2011-09-03 14:31:33 +02:00
Emanuel Schuetze
444cb5d23f Automated merge with ssh://openslides.org/openslides 2011-09-03 13:53:45 +02:00
Emanuel Schuetze
cc10d5042b Show invalid votes and votes cast for application and assignment results. 2011-09-03 13:53:37 +02:00
Oskar Hahn
a32ed1d059 do not show the elected box in assignment edit form 2011-09-03 12:26:14 +02:00
Oskar Hahn
98ee433cd3 merge error 2011-09-03 11:56:35 +02:00
Oskar Hahn
f5d2a503d0 Automated merge with ssh://oshahn.de/openslides 2011-09-03 11:46:22 +02:00
Oskar Hahn
dcbeb452fb canidate in assignment can be marked as elected 2011-09-03 11:42:44 +02:00
Emanuel Schuetze
ca0c50caef Many improvements for application and assignment poll system. 2011-09-03 10:52:29 +02:00
Emanuel Schuetze
2278ddca54 DB change: Changed voteinvalid to votesinvalid. 2011-09-03 00:43:09 +02:00
Oskar Hahn
3db6a12024 Add code 2011-07-31 10:46:29 +02:00