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

331 Commits

Author SHA1 Message Date
rene
a2db589272 Automated merge with ssh://openslides.org/openslides 2011-11-24 20:24:27 +01:00
rene
03bca90511 Extend patchup for builtin excel dialect 2011-11-24 20:24:13 +01:00
Emanuel Schuetze
8ef0b0ad81 Merged. 2011-11-24 19:53:03 +01:00
Emanuel Schuetze
8d21b8d831 Participant edit/new form: Changed default value of gender and type to blank/not specified. 2011-11-24 19:51:16 +01:00
Emanuel Schuetze
72de1dce74 Fixed missing form invalid error message. 2011-11-24 19:42:32 +01:00
rene
d75e736be7 Add patchup-helper to assist csv.Sniffer() 2011-11-24 19:38:25 +01:00
rene
c448ce95bd Switch to python-provided CSV module - implements #66 2011-11-22 18:49:36 +01:00
Emanuel Schuetze
bbb61a9091 Fixed #65: Set default value for config options: 'Number of ballot papers (selection)' 2011-11-21 18:00:58 +01:00
Emanuel Schuetze
3679dbdf52 Fixed #64: Reorder election settings form fields. 2011-11-17 18:16:51 +01:00
Emanuel Schuetze
52dc3f2a1a Fixed #63: First password is always generated after saving participant edit form. 2011-11-17 18:14:41 +01:00
Emanuel Schuetze
c9b9eafbb2 Fixed #62: General event settings are not displayed in settings form. 2011-11-17 18:06:41 +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
c88ff41805 Reordered config tab subpages. 2011-11-14 23:40:19 +01:00
Emanuel Schuetze
49d2b57a66 Added initial welcome text. 2011-11-14 23:12:52 +01:00
Emanuel Schuetze
dd85f07d66 Updated translation. 2011-11-14 23:01:43 +01:00
Emanuel Schuetze
3ae853f082 Removed incompleted unit tests for 1.1 release. 2011-11-14 22:54:31 +01:00
Emanuel Schuetze
470684b199 Automated merge with ssh://openslides.org/openslides 2011-11-14 21:58:16 +01:00
rene
528b49da99 Use gen_password() for new user objects created via user or application import. 2011-11-14 21:54:42 +01:00
Emanuel Schuetze
763b8c15e1 Improve confirm agenda item delete message dependent on childrens available or not. 2011-11-14 21:52:33 +01:00
Emanuel Schuetze
d54afd7ad6 Removed generate passwords function/link. Now passwords will be generated after creating participants. 2011-11-14 21:25:20 +01:00
Emanuel Schuetze
e7d8b8a5ee #58: Generate password after user createion automatically. 2011-11-14 21:13:13 +01:00
rene
d9d2692ffc Filter permissions displayed in the group editor (as requested by #59). 2011-11-14 20:45:04 +01:00
Emanuel Schuetze
9b1a6388a7 Added css cursur attribute for notification div. 2011-11-14 20:40:13 +01:00
Emanuel Schuetze
e156625975 Fixed permission. 2011-11-14 20:23:06 +01:00
Emanuel Schuetze
b0f9ab09d5 Added link to countdown timer config option. 2011-11-14 20:17:48 +01:00
Emanuel Schuetze
9feca83bb3 Fixed IE CSS issues (with white-space: nowrap). 2011-11-14 20:14:56 +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
rene
9f50863439 Implement rights for anonymous as requested by #45 2011-11-14 16:37:12 +01:00
Emanuel Schuetze
40dc6f56df Updated jquery.js to version 1.7. 2011-11-09 23:36:33 +01:00
Emanuel Schuetze
2a192e2dea Added missing tabledrag images. 2011-11-09 23:17:03 +01:00
Emanuel Schuetze
ecc788f47d Updated translations. 2011-11-09 23:06:39 +01:00
Emanuel Schuetze
de62241dc7 Application: Added import (#55) and trivial changes (#56) function. Thanks to Rene Koecher! 2011-11-09 22:53:10 +01:00
Emanuel Schuetze
aad0d2f02b Added missing icons for countdown control. 2011-11-09 21:55:35 +01:00
Emanuel Schuetze
8f3590fb9c Fixed typo. 2011-11-09 21:42:23 +01:00
Emanuel Schuetze
bc9326e567 Removed knockout.js (no longer required). 2011-11-09 21:26:05 +01:00
Emanuel Schuetze
076699ff45 #52: Added countdown on projector view with control unit (agenda overview) and time variable (general settings). 2011-11-09 21:16:02 +01:00
Emanuel Schuetze
52c24d6a48 Removed old background image (no longer required). 2011-11-07 21:16:04 +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
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
Emanuel Schuetze
e64e91c52d Updated translations. 2011-11-01 08:26:47 +01:00
Emanuel Schuetze
f757b44f70 Fixed error if PDF preamble is empty. 2011-11-01 08:26:37 +01:00
Emanuel Schuetze
15f872b6e2 Fixed permissions to delete own applications (if they have no number). 2011-11-01 08:07:27 +01:00
Emanuel Schuetze
a23164a906 Order submitter and supporter fields by full name in ApplicationManagerForm. 2011-11-01 06:47:10 +01:00
Emanuel Schuetze
66c078b333 Typo. 2011-10-31 20:21:19 +01:00
Emanuel Schuetze
0ea6e3d2a3 Revert: Set DEBUG to True (using True for development and False for release only) 2011-10-31 20:21:03 +01:00
Emanuel Schuetze
2730d32bf9 Set DEBUG to False. 2011-10-25 22:29:52 +02:00
Emanuel Schuetze
b6ccb357d1 #26: Added new config options to set numbers of ballot pdf papers for application and assignment 2011-10-25 22:03:21 +02:00
Emanuel Schuetze
424fe34325 Minor style changes. 2011-10-24 21:05:18 +02:00
Emanuel Schuetze
82613c5490 Updated translation (new: gender-sensitive) 2011-10-24 21:05:06 +02:00
Emanuel Schuetze
4a3564aed8 #48 (election): Added percentage for voting results (view, projector, pdf). 2011-10-20 22:56:22 +02:00
Emanuel Schuetze
34f76c8c28 #27: Added default sort for assignments and participants. 2011-10-05 21:35:20 +02:00
Emanuel Schuetze
fa5918e951 New config option to set title and preamble text for application and assignment pdf. 2011-10-05 21:18:28 +02:00
Emanuel Schuetze
b76c4d8ecf Opened add-user-url in new tab. 2011-09-29 22:36:21 +02:00
Emanuel Schuetze
d2295cb93b Mark elected candidates in assignment pdf. 2011-09-29 22:14:46 +02:00
Emanuel Schuetze
91ff36e19a Fixed: Show "undocumented" for -2 in assignment pdf. 2011-09-21 21:28:27 +02:00
Emanuel Schuetze
bfadbce541 Fixed: Show "undocumented" for -2 in application pdf. 2011-09-21 21:28:01 +02:00
Emanuel Schuetze
6c008488cf Application: Check enough supports in status "pub" only. 2011-09-21 21:27:23 +02:00
Emanuel Schuetze
cea2992ca0 Application: Show profile instead of submitter username. 2011-09-21 21:26:44 +02:00
Emanuel Schuetze
af240bb788 Fixed: Print available candidates at assignment pdf. 2011-09-21 21:24:56 +02:00
Emanuel Schuetze
045c09577a Updated translation. 2011-09-21 21:24:21 +02:00
Emanuel Schuetze
54b148a704 Splitted up hidden agenda items in new table section. 2011-09-21 21:23:22 +02:00
Emanuel Schuetze
042eae9ecc Allowed HTML for Item Text. 2011-09-21 21:23:00 +02:00
Emanuel Schuetze
bd9891fe5e Show results for elected candidates only (assignment beamer view). 2011-09-21 21:21:01 +02:00
Emanuel Schuetze
28d7d17587 Removed empty character for no results cell. 2011-09-21 21:17:22 +02:00
Emanuel Schuetze
2f027663ed Improved assignment projector view. 2011-09-21 21:14:19 +02:00
Emanuel Schuetze
d671d2b153 Fixed wrong line break in assignment ballot pdf (used split in 
stead of rsplit).
 2011-09-21 21:13:54 +02:00
Emanuel Schuetze
10e8b95b1b Show 'hidden' information in agenda item type column for hidden items (visible for managers only). 2011-09-21 21:13:33 +02:00
Emanuel Schuetze
d85b9e11fa Added new item-done-column for all non-manager. 2011-09-21 21:12:15 +02:00
Emanuel Schuetze
947d54b8dd Show blue elected line for beamer ajax view. 2011-09-21 21:10:23 +02:00
Emanuel Schuetze
206ed7bd8b Fixed zoom problem for sidebar div in beamer view. 2011-09-21 21:02:29 +02:00
Emanuel Schuetze
e09388fd6e Use get_type_display for profiles. 2011-09-21 21:01:56 +02:00
Emanuel Schuetze
d70219e757 Updated translation. 2011-09-21 21:01:27 +02:00
Emanuel Schuetze
3c2cfe508a Show participants pdf for users with see-particiants-permissions 2011-09-21 21:01:00 +02:00
Emanuel Schuetze
d53c4ea5ba fix scalling from beamer 2011-09-21 20:58:15 +02:00
Emanuel Schuetze
7aed6ac354 encoding error 
HGr Bitte gib eine Versions-Meldung ein. Zeilen beginnend mit 'HG:' werden entfernt.
 2011-09-21 20:56:58 +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
c6fd0beae6 Import parse_qs from cgi instead from urlparse for old python versions. 2011-09-12 08:32:05 +02:00
Emanuel Schuetze
1dc631d82d Automated merge with ssh://openslides.org/openslides 2011-09-12 08:06:44 +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
5cbef3a735 show revsion tag, if any 2011-09-11 21:06:03 +02:00
Emanuel Schuetze
9917e2f545 Fixed index error while generating assignment pdf. 2011-09-11 18:37:20 +02:00
Emanuel Schuetze
7ef4013b4b Fixed agenda pdf layout of subitems. 2011-09-11 17:06:32 +02:00
Oskar Hahn
f673233a18 fixt encoding-error 
the new filter-sort-function take use of urllib.urlencode. This function
does not encode unicode-strings. So we have to decode every value in the
sortfilter-dict
 2011-09-10 09:40:39 +02:00
Oskar Hahn
97327a3b17 rewrote the filter and sort system for participant 2011-09-10 00:16:57 +02:00
Oskar Hahn
2973ec1f33 set cookie in @template decorator 
if the dict has the value cookie, set a cookie with dict['cookie'][0] as Name and ['cookie'][1] as value
 2011-09-10 00:16:39 +02:00
Oskar Hahn
2fe4a0ce29 last changes for application, too 2011-09-09 22:40:38 +02:00
Oskar Hahn
10c3d624fe replace -2 with undocumented in beamer view of polls 2011-09-09 22:34:55 +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
Oskar Hahn
7be90c89c7 undocumentet poll results 2011-09-09 16:18:17 +02:00
Emanuel Schuetze
91049155a6 Print election results in pdf. Fixed redirect. 2011-09-09 16:18:11 +02:00
Emanuel Schuetze
72a2b824fd Added error messeage for import function if you are not superuser. 2011-09-09 10:55:33 +02:00
Emanuel Schuetze
475b7a1ffe Updated application projector view. 2011-09-08 18:57:11 +02:00
Emanuel Schuetze
88447db814 Added log after adding/removing supporters as manager. 2011-09-08 17:39:57 +02:00
Emanuel Schuetze
85d61d38e5 Added publish/unpublish icon. 2011-09-08 16:39:41 +02:00
Emanuel Schuetze
adebbf4125 Automated merge with ssh://openslides.org/openslides 2011-09-08 12:30:40 +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
ab96b32790 Fixed: cast to string required. 2011-09-08 09:37:19 +02:00
Oskar Hahn
508be2f4eb beamer clean link 2011-09-08 09:23:21 +02:00
Emanuel Schuetze
1f5d86a0fc Show assignment vote results on projector view. 2011-09-07 23:25:59 +02:00
Emanuel Schuetze
c53e5267c5 Updated translations. 2011-09-07 22:46:47 +02:00
Emanuel Schuetze
096b4c4cb0 Changed default value for participant type from delegate to guest. 2011-09-07 22:20:07 +02:00
Emanuel Schuetze
f5f220417a Fixed manage permission. Updated message translation. 2011-09-07 22:17:19 +02:00
Emanuel Schuetze
3001b9f474 Layout fix for pdf assignment icon. 2011-09-07 22:03:04 +02:00
Emanuel Schuetze
123426329d Print also applications without a number. 2011-09-07 20:37:56 +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
dc782739cc Translation updated. 2011-09-07 19:32:26 +02:00
Emanuel Schuetze
57e966a97b Updated application pdf. 2011-09-07 18:43:25 +02:00
Emanuel Schuetze
f185b2e63c Show type field for non-manager. 2011-09-07 18:06:11 +02:00
Oskar Hahn
7d46574498 realy realy save password... 2011-09-07 14:27:36 +02:00
Oskar Hahn
8ad6ebfeee realy save password with the user_reset_password function 2011-09-07 14:21:42 +02:00
Oskar Hahn
a42e352d2a Automated merge with ssh://oshahn.de/openslides 2011-09-07 09:56:30 +02:00
Oskar Hahn
e42030b1ba count users in partition overview 2011-09-07 09:56:19 +02:00
Emanuel Schuetze
5fd31f6ca6 Added assignment pdf. 2011-09-07 07:52:44 +02:00
Emanuel Schuetze
d8a880105a Some minor renames (applications # -> no., beamer -> projector etc.) 2011-09-06 23:23:05 +02:00
Emanuel Schuetze
1708c148ad Updated translations. 2011-09-06 23:22:13 +02:00
Emanuel Schuetze
288133b551 Application PDF: Added signature field for submitter. 2011-09-06 23:01:21 +02:00
Emanuel Schuetze
bb38d8b85e Updated application PDF. Added vote results. 2011-09-06 22:22:29 +02:00
Emanuel Schuetze
ecc728c8e9 Some agenda style changes. 2011-09-06 18:45:34 +02:00
Oskar Hahn
08a1e88e12 newest version link for application 2011-09-06 10:41:06 +02:00
Oskar Hahn
f6b335245d set more then one firstpassword 2011-09-06 10:15:23 +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
Oskar Hahn
3c42b26d6f Automated merge with ssh://oshahn.de/openslides 2011-09-06 09:27:11 +02:00
Oskar Hahn
0727b1d72a permission_required is only allowds in views with request as first argument 2011-09-06 09:17:39 +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
4fb4691f14 Added counter and message for password generation. 2011-09-05 22:26:19 +02:00
Emanuel Schuetze
7eac8cda5d Beamer: Display election status finished. 2011-09-05 21:53:15 +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
9275acf029 Show full profile name of supmitter and supports. 2011-09-05 20:05:23 +02:00
Emanuel Schuetze
35c0b50940 Fix redirect for user group overview. 2011-09-05 19:53:40 +02:00
Oskar Hahn
41fbd456d2 add group by user-import 2011-09-05 10:11:47 +02:00
Oskar Hahn
450190e603 show group in passwordlist 2011-09-05 09:14:38 +02:00
Oskar Hahn
90991f62e7 Automated merge with ssh://oshahn.de/openslides 2011-09-05 09:08:20 +02:00
Oskar Hahn
510cbf8374 reorder user-import csv data 2011-09-05 09:08:12 +02:00
Oskar Hahn
c6259d83bb set first password by users with None or '' firstpassword 2011-09-05 09:08:00 +02:00
Emanuel Schuetze
b8ff9696b4 Minor. 2011-09-04 19:28:06 +02:00
Emanuel Schuetze
b7a1afd3a2 Changed url 'item' to 'agenda'. 2011-09-04 19:22:30 +02:00
Emanuel Schuetze
e85f5b4f1e Minor style changes. 2011-09-04 19:22:08 +02:00
Emanuel Schuetze
d3adc382b8 Updated translations. 2011-09-04 19:08:38 +02:00
Emanuel Schuetze
53ee9c598d Added icons for controling beamer view (pan,zoom) 2011-09-04 19:08:20 +02:00
Emanuel Schuetze
30afe96fc0 AVersion fixes: Added reject confirm message. Style changes. 2011-09-04 19:07:45 +02:00
Emanuel Schuetze
3b2763e2dc PDF: Fixed items in layer 3+ 2011-09-04 19:06:48 +02:00
Emanuel Schuetze
6b7697a5b2 Changed translation string: revision -> version. 2011-09-04 12:35:46 +02:00