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

3278 Commits

Author SHA1 Message Date
Emanuel Schuetze
65840d4261 Minor changes in assigment view template. 2012-09-10 17:15:43 +02:00
Emanuel Schuetze
94ffb3ab45 Redesign login template. 2012-09-07 21:25:18 +02:00
Emanuel Schuetze
6a3bead5f6 Cleanup template code and style. 2012-09-06 23:59:03 +02:00
Emanuel Schuetze
ae51d9e7da Adjusted template for assignment app. 2012-09-06 23:58:20 +02:00
Emanuel Schuetze
7c90206b3f Adjusted new template for participant app. Added new generic form. 2012-09-06 22:41:24 +02:00
Oskar Hahn
75eb596547 block a user to be a candidate from a assignment, if he delete his 
candidation by him self
 2012-09-06 15:57:42 +02:00
Norman Jäckel
d1c12ea0e5 Sorting applications in the widget by number 2012-09-05 22:42:44 +02:00
Norman Jäckel
2ecd552d2b Default Sorting of applications by number 2012-09-05 22:38:40 +02:00
Norman Jäckel
d84a8d2bdd Sorting assignments by name in the widget 2012-09-05 22:19:53 +02:00
Norman Jäckel
55073494fc Insert weight field in custom slides and order custom slides in the widget 2012-09-05 21:54:34 +02:00
Emanuel Schuetze
8da28310f7 Hide optional columns on mobile devices (with small window width). 2012-09-05 07:54:01 +02:00
Emanuel Schuetze
13cfdb36af Updated login form to new template style. 2012-09-05 00:43:19 +02:00
Emanuel Schuetze
7fde53a09e Updated template with twitter bootstrap. Step 1: agenda and application. 2012-09-05 00:20:28 +02:00
Andy Kittner
1b65044223 Remove a few spaces for pep8 conformance 2012-08-28 19:07:40 +02:00
Andy Kittner
cc20ec3456 Add special handling to determine default settings for portable version 
The portable version will prefer to create it's settings in it's own
directory and only fallback to a user-specific path
($LOCAL_APPDATA/openslides) if this directory is not writable
 2012-08-27 21:48:46 +02:00
Norman Jäckel
6d1c356ffd Name openslides_personal_settings.py and openslides_global_settings.oy 2012-08-24 14:23:12 +02:00
Norman Jäckel
32cfa6c914 Fix encoding error in settings.py #349 2012-08-23 23:34:30 +02:00
Emanuel Schuetze
777d2266bc Fixed drag'n'drop of widgets into empty dashboard column. Renamed 
projector-control{js|css} files into dashboard{js|css}.
 2012-08-22 09:39:20 +02:00
Oskar Hahn
423f04d0be send overlay message data to own view 2012-08-15 18:00:22 +02:00
Oskar Hahn
705fb972b1 removed projector link from agenda 2012-08-15 13:44:15 +02:00
Oskar Hahn
416f3f6ff3 added select widgets view 2012-08-15 13:42:25 +02:00
Oskar Hahn
6b7ea558fc rewrote widgets for the dashboard 2012-08-15 11:56:43 +02:00
Oskar Hahn
dfb24ba61a Merge branch 'master' into dashboard 2012-08-15 11:05:29 +02:00
Oskar Hahn
9c031768f8 fix merge errors 2012-08-15 11:01:38 +02:00
Oskar Hahn
c6bc50e2fd rename projector to dashboard 2012-08-15 10:58:29 +02:00
Oskar Hahn
b7a0e83c68 changed the main script 2012-08-14 14:19:59 +02:00
Oskar Hahn
a2be848932 Merge branch 'master' into install 2012-08-13 19:35:14 +02:00
Oskar Hahn
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
Oskar Hahn
d0e7419666 Merge remote-tracking branch 'openslides/stable/1.2.x' 2012-08-13 18:36:23 +02:00
Oskar Hahn
5178363127 Merge pull request #6 from ostcar/translation 
Translation
 2012-08-13 09:30:17 -07:00
Oskar Hahn
31ca01563e some corrective actions 2012-08-13 14:37:49 +02:00
Oskar Hahn
df40de67b0 rename openslidesuser to user and openslidesgroup to group 2012-08-12 12:52:38 +02:00
Oskar Hahn
0a8ee9cbad changed request.user to be the openslidesuser 2012-08-12 10:12:26 +02:00
Oskar Hahn
6795ccd25b change the users in the groupform 2012-08-11 11:36:55 +02:00
Oskar Hahn
cdf160dfc3 fix some problems with the creation of new users 2012-08-11 11:09:20 +02:00
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
Emanuel Schuetze
92562aef28 #188: Fixed projector template style error. 2012-05-15 20:36:49 +02:00
Andy Kittner
298cefcb45 Fix error when creating new applications (introduced by translation fix) 2012-05-15 20:10:54 +02:00
Emanuel Schuetze
61fe84a780 Removed LANGUAGE_CODE and TIME_ZONE from default.settings.py. LANGUAGE_CODE no longer required after fix of rev615. 2012-05-15 19:51:40 +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
c19025ceb3 #190: Fixed typo in translation. 2012-05-14 23:10:17 +02:00
Emanuel Schuetze
3324ce6131 Removed help text of active form field by overriding. 2012-05-14 23:07:24 +02:00
Emanuel Schuetze
1d6a0bee4e #174: Change form field 'groups' to 'user groups'. 2012-05-14 23:04:00 +02:00
Emanuel Schuetze
31ae7c38c9 #192: i18n-de: Beamer -> Projektor 2012-05-14 22:16:13 +02:00
Emanuel Schuetze
304013649b Changed default event description. Updated tranlsations. 2012-05-14 22:08:40 +02:00
Emanuel Schuetze
bc9765230c #185: Wrong permission to print assignments. 2012-05-14 22:02:45 +02:00
Emanuel Schuetze
bb5fcf4d6d #183: Wrong permission to print application. 2012-05-14 22:00:22 +02:00
Emanuel Schuetze
114b719cad Added comment column in agenda overview. 2012-05-14 21:55:36 +02:00
Emanuel Schuetze
fbf2256493 #182: Wrong permission for edit button in view template. 2012-05-14 21:55:02 +02:00
Emanuel Schuetze
d8807ba979 #180: Ballot description. Fixed ballot number function. 2012-05-14 21:34:46 +02:00
Emanuel Schuetze
911b7ebac8 Changed po file header. 2012-05-11 07:38:56 +02:00
Emanuel Schuetze
b65e21e08f #100: Fixed wrong permissions. 2012-04-30 08:50:35 +02:00
Emanuel Schuetze
eb7672074e Some more style work for application projector template. 2012-04-30 08:30:04 +02:00
Emanuel Schuetze
e28c15eff9 Improve projector style of application voting results. 2012-04-30 08:23:50 +02:00
Emanuel Schuetze
3faa91f5a4 Updated translation. 2012-04-30 08:23:06 +02:00
Emanuel Schuetze
1089e61011 Modified support help text. 2012-04-29 21:58:16 +02:00
Emanuel Schuetze
8bdd57cada Prepare 1.2-beta1 release. 2012-04-29 21:43:21 +02:00
Emanuel Schuetze
616a34e8a9 Changed style: td:hover to tr:hover. 2012-04-29 21:32:29 +02:00
Emanuel Schuetze
412e672ea1 Set default language for model/form translation strings. Have to changed for English installation! 
(Template strings are translated automatically by selected browser language)
 2012-04-29 21:17:15 +02:00
Emanuel Schuetze
8c8a3e9fc2 Updated translations. 2012-04-29 20:48:10 +02:00
Emanuel Schuetze
3a0d243a6c Added agenda 'edit' button in view template. 2012-04-29 20:47:54 +02:00
Emanuel Schuetze
2186561b6e Removed LANGUAGE_CODE ('de') because django uses language selected by browser. Default language is 'en'. 2012-04-29 19:33:57 +02:00
Emanuel Schuetze
79605531c5 Some minor style fixes for poll view templates. 2012-04-29 19:12:18 +02:00
Emanuel Schuetze
905d9d546c Fixe pdf icon path. 2012-04-29 19:01:18 +02:00
Emanuel Schuetze
e1799b4c83 #155: remove header/footer in first-password-pdf 2012-04-29 18:58:51 +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
7eaf9899f6 Minor code comment changes. 2012-04-28 22:32:33 +02:00
Emanuel Schuetze
64eed5ff22 #90: Projector control: Save portlet state in session. 2012-04-28 22:31:30 +02:00
René Köcher
842e8de065 #160: Wrong scaling of projector live view in IE8/Konqueror 
IE8 has a scaling bug - check the browser version and resize the iframe 4x bigger if needed..
 2012-04-28 09:38:31 +02:00
René Köcher
4f98c0c571 #163: Sorting by title or creation time returns one entry for each version of an application 2012-04-28 08:45:11 +02:00
Andy Kittner
7b8f882f0d Fallback to localhost if IP of current hostname can't be determined 2012-04-27 22:54:20 +02:00
Emanuel Schuetze
2c2a99d738 Automated merge with ssh://openslides.org/openslides 2012-04-27 22:47:47 +02:00
Emanuel Schuetze
1a4a748e6c #112: Use monotype for printing first time password 2012-04-27 22:47:41 +02:00
René Köcher
537571ec69 #100 Delete applications by admin/superuser only: part2 2012-04-27 22:46:27 +02:00
Emanuel Schuetze
59c342ba8d #158: Move 'change tree' notification to correct position (above page title). 2012-04-27 21:53:50 +02:00
Emanuel Schuetze
20ce7579ce #158: Added from_invalid error notification for ItemCreate/Update. 2012-04-27 21:40:42 +02:00
Emanuel Schuetze
822264ef7b #158: Added success notification for ItemCreate/ItemUpdate View. 2012-04-27 21:36:12 +02:00
René Köcher
81bc19730b #100 Delete applications by admin/superuser only: part1 2012-04-27 21:22:44 +02:00
Emanuel Schuetze
710882c28a #96 Countdown: Improve control icons 2012-04-27 17:42:05 +02:00
Emanuel Schuetze
8ed8ca0c58 Automated merge with ssh://openslides.org/openslides 2012-04-27 08:04:53 +02:00
Emanuel Schuetze
f97529518e Updated translations. 2012-04-27 08:04:16 +02:00
Emanuel Schuetze
804c3da59a Updated tranlation string. 2012-04-27 08:02:01 +02:00
René Köcher
030ff09ec0 #97: (Aftermath) 
Quick cross-browser fix: remove the spin-buttons and use input type=number.
If your browser is HTML5 it should show a spin box, otherwise the fallback
(type=text) will work equally well.
 2012-04-27 07:59:23 +02:00
René Köcher
7f54331d0c Merge r559.. 2012-04-27 07:52:53 +02:00
René Köcher
c3c7228ab9 #159 Countdown reset should change 'pause' back to 'play'. 2012-04-27 07:51:42 +02:00
René Köcher
c0b78f52ea Backout changeset 3dafb78cc57f4ce55b8e4517eb48fd9e9e744e2d 2012-04-27 07:50:20 +02:00
René Köcher
f45eb68fb4 #159 Countdown reset should change 'pause' back to 'play'. 2012-04-27 07:46:47 +02:00
Andy Kittner
8da2f0f041 Fix start script broken by r550 
Defer importing modules that require the DJANGO_SETTINGS_MODULE
to be available until  prepare_openslides() had a chance to set
everything up.
 2012-04-27 01:09:12 +02:00
Emanuel Schuetze
3bcf4fd9c3 Added missing 'required' helptext to all forms. 2012-04-26 17:50:46 +02:00
René Köcher
7b7f43b04a #97: Countdown: move countdown config input field from config tab to portlet 2012-04-26 12:43:35 +02:00
Emanuel Schuetze
aac48a0b02 Redesign overlays. 2012-04-26 08:52:20 +02:00
Emanuel Schuetze
8a4163b019 Fixed scroll bug in base.css. 2012-04-25 23:07:54 +02:00
Emanuel Schuetze
b0d64c2bcc Updated jquery ui style. 2012-04-25 22:59:49 +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
Andy Kittner
dda3078fe0 Detect if the database was deleted and run syncdb if necessary (fixes #156) 2012-04-25 19:37:51 +02:00
René Köcher
053021a08f #XX Countdown: Only show valid controls for the active countdown 
When clicking on 'play' the button will morph into 'stop' and vice-versa.
This is persistent across clients e.g. when A starts the countdown and
then B opens the control page B will see a pause button.
(Updates for all but the local client happen only on page reload)
 2012-04-25 18:45:02 +02:00
René Köcher
07b5614fac #94 Countdown: support for pause/resume / #95 Countdown: show correct time format as mm:ss 2012-04-25 17:17:24 +02:00
Emanuel Schuetze
3cb7417028 Minor CSS fixes. 2012-04-25 09:18:10 +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
20f17d6235 Fixed untranslateable model string. 2012-04-23 22:17:45 +02:00
Emanuel Schuetze
dc863cc3b9 Added custom slides portlet. 2012-04-23 22:07:52 +02:00
Emanuel Schuetze
3d0fe9b565 Updated translations. 2012-04-23 22:07:34 +02:00
Emanuel Schuetze
cfcd2d10d7 Fixed wrong icon filename. 2012-04-23 21:48:20 +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
1b8c1eda91 Updated translations. 2012-04-22 16:51:22 +02:00
Emanuel Schuetze
039bd4121c Some assignment poll template fixes. 2012-04-21 22:27:11 +02:00
Emanuel Schuetze
99bfd7257b #120: Add CSS class for helptext in forms. 2012-04-21 22:23:46 +02:00
Emanuel Schuetze
61d4d1ca2f #136: Fixed missing polls in projector view 2012-04-21 21:38:59 +02:00
Emanuel Schuetze
5f3c6c4821 #111: Move pdf creation code from utils to participant app. 2012-04-20 23:23:50 +02:00
Emanuel Schuetze
f1908bca89 Fixed permissions for action columns. 2012-04-20 22:58:57 +02:00
Emanuel Schuetze
f711f96265 #107: New actions column for elections. 2012-04-20 22:58:34 +02:00
Emanuel Schuetze
667582cdfb #106: add pdf link to actions column 2012-04-20 22:47:44 +02:00
Emanuel Schuetze
3886449b2c #106: Action column for applications. 
#121 (partly): Activate links for agenda and applications table.
 2012-04-20 22:43:12 +02:00
Emanuel Schuetze
6125f1d88b Minor javascript fix. 2012-04-20 22:41:57 +02:00
Emanuel Schuetze
ccc1d2b707 #104: Updated second submneu for application. 2012-04-20 22:13:47 +02:00
Emanuel Schuetze
7a6eaf2660 Fixed building AssignmentPollPDF. 2012-04-20 14:33:40 +02:00
Emanuel Schuetze
f393789f2d Show min. 1 application ballot. 2012-04-20 13:41:09 +02:00
Emanuel Schuetze
4ecff16aba copyright 2011 -> 2012. 2012-04-20 12:44:45 +02:00
Emanuel Schuetze
42a2e44390 Updated translations. 2012-04-20 11:15:15 +02:00
Emanuel Schuetze
ae5efcfa9d Some minor fixes for agenda, application, participant overview table. 2012-04-20 08:14:23 +02:00
Oskar Hahn
4e904c7356 now it is possible to create a item, witch is realted to another object, for example an application. 2012-04-19 12:46:04 +02:00
Oskar Hahn
e23c195388 show application title in presentation view 2012-04-19 11:10:36 +02:00
Oskar Hahn
74c704641c fixed yes, no, abstain values in the presentation View of an Application 2012-04-19 11:08:22 +02:00
Oskar Hahn
1d285a1c15 remove print 2012-04-18 23:36:52 +02:00
Emanuel Schuetze
9849140d2e Remove submenu from static slides. 2012-04-18 22:06:41 +02:00
Emanuel Schuetze
6be853f202 Removed default font from jquery-ui css. 2012-04-18 22:06:18 +02:00
Emanuel Schuetze
236bbfd3bc Automated merge with ssh://openslides.org/openslides 2012-04-18 22:01:06 +02:00
Emanuel Schuetze
4adb221a9d #92: Projector control: Add projector preview icon for all entries. 2012-04-18 22:00:58 +02:00
Oskar Hahn
59225bf822 added default get_filename for PDFView 2012-04-18 20:57:44 +02:00
Oskar Hahn
07e9d8e9f9 rewrote application filters 2012-04-18 19:57:39 +02:00
Emanuel Schuetze
a35e1917a4 Removed unused icons. 2012-04-18 19:52:37 +02:00
Emanuel Schuetze
7eb410f093 #104: Application submenu. 2012-04-18 19:50:51 +02:00
Emanuel Schuetze
ee4d7da04a #105: Show Ballot number for applications. Some application PDF work. Set default config values. 2012-04-18 19:30:32 +02:00
Oskar Hahn
9f70b2ff1c rename ballout def in application and assignment 2012-04-18 19:02:41 +02:00
Oskar Hahn
a77038fbf4 removed some old countdown code, defined some default values 2012-04-18 18:55:33 +02:00
Emanuel Schuetze
4b2211d59f Automated merge with ssh://openslides.org/openslides 2012-04-18 18:54:52 +02:00
Emanuel Schuetze
3812b5ebd1 #103: Set application filename. 2012-04-18 18:54:48 +02:00
Oskar Hahn
23df763b1f fix message issus: #134, also defined some default config-values 2012-04-18 18:35:02 +02:00
Emanuel Schuetze
67db762575 Automated merge with ssh://openslides.org/openslides 2012-04-18 18:29:34 +02:00
Emanuel Schuetze
4ce8facd1a #98: Add new filter for active/inactive items. 2012-04-18 18:29:31 +02:00
Oskar Hahn
0dde1738cf fixed active line #88 2012-04-18 18:07:24 +02:00
Oskar Hahn
e9e9fa54b2 fixed problem with deleting the default permissions 2012-04-18 16:57:33 +02:00
Oskar Hahn
49e2f73df4 #92 preview for slides 2012-04-18 15:47:51 +02:00
Oskar Hahn
6798050ded added help_message 2012-04-18 15:04:16 +02:00
Oskar Hahn
67384d0644 indent items in control view 2012-04-18 14:53:19 +02:00
Andy Kittner
aa54ac6d7d Fix settings.py creation on python-2.5 (Closes #133) 
dir() was not overrideable on python2.5 so it doesn't trigger an import
of the real settings module. Use getattr() instead, this works accross all
versions.
 2012-04-18 16:41:12 +02:00
Oskar Hahn
fbaa88c23a #99 fixed problem with agenda-items and mptt 2012-04-18 14:36:03 +02:00
Oskar Hahn
be6a63e48c show version from plugins 2012-04-18 09:33:09 +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
a3d7cc98a9 #110 error in application pdf printing 2012-04-17 17:47:37 +02:00
Oskar Hahn
189cfa1309 translate poll values 2012-04-17 17:35:50 +02:00
Oskar Hahn
0a8d40e2ac slideUp read messages 2012-04-17 14:45:25 +02:00
Oskar Hahn
56f1a15cac added function to set messages in JavaScript 2012-04-17 13:41:43 +02:00
Oskar Hahn
6aa241b268 fixed error in get_active_slide() 2012-04-17 12:07:32 +02:00
Emanuel Schuetze
131d84bee4 Reduced custom jquery.ui to minimum (ui core, widget, mouse and sortable). 
Changed jquery.ui style to humanity.
Some layout things in control template.
 2012-04-17 09:13:02 +02:00
Oskar Hahn
da8c3c0bba show pollresults in application projector 2012-04-16 17:21:41 +02:00
Oskar Hahn
03792c0b05 put projector message in the center of the presentation 2012-04-16 17:14:39 +02:00
Oskar Hahn
7d16717ca8 clean button for message 2012-04-16 16:38:47 +02:00
Oskar Hahn
534a81c46c rewrote projector_messages system. Recalled it projector_overlay and added a special overlay for unique messages 2012-04-16 16:35:30 +02:00
Oskar Hahn
3bceca2359 use plugin.NAME for submenu-title in config-tab 2012-04-16 11:36:50 +02:00
Oskar Hahn
80c5bfbba9 translation in JS-files 2012-04-16 11:12:21 +02:00
Oskar Hahn
c1cd0a2805 send class, not object, for template_manipulation 2012-04-16 11:11:45 +02:00
Emanuel Schuetze
81f4a8c5d5 Automated merge with ssh://openslides.org/openslides 2012-04-15 16:13:32 +02:00
Emanuel Schuetze
84731a07d5 Updated application view submenu. 2012-04-15 16:13:26 +02:00
Andy Kittner
beaa3e341a Create portable win32 binary distribution 2012-04-15 16:04:08 +02:00
Oskar Hahn
92305bf363 use item for item sid 2012-04-15 16:02:13 +02:00
Oskar Hahn
d2d3725eb6 fix agenda.test 2012-04-15 16:00:25 +02:00
Emanuel Schuetze
bc31a2df1a Automated merge with ssh://openslides.org/openslides 2012-04-15 15:53:10 +02:00
Emanuel Schuetze
f44f2723dc Added link to activate agenda item in overview table. 2012-04-15 15:53:05 +02:00
Oskar Hahn
90038c1ad2 fix error by activating the Agenda 2012-04-15 15:46:32 +02:00
Emanuel Schuetze
8b7fdc7a5c Automated merge with ssh://openslides.org/openslides 2012-04-15 15:21:23 +02:00
Emanuel Schuetze
4967b2b358 New agenda view template. 2012-04-15 15:21:19 +02:00
Oskar Hahn
a3808c7b30 fixed problem in assignment poll 2012-04-15 14:58:05 +02:00
René Köcher
b620c0afb7 Add 'zoom' css attribute if we detect MSIE. 2012-04-15 14:51:50 +02:00
Emanuel Schuetze
da9861b9f7 Automated merge with ssh://openslides.org/openslides 2012-04-15 14:28:34 +02:00
Emanuel Schuetze
0657ff340d Show clickable done action in first column in agenda overview. 2012-04-15 14:28:01 +02:00
René Köcher
82d4a2de4b Try to get a working beamer preview for more browsers. 2012-04-15 14:27:27 +02:00
Emanuel Schuetze
ddeaea88c4 Moved agenda pdf link to submenu. 2012-04-15 14:16:00 +02:00
Emanuel Schuetze
abf7721f3f Filled frontpage with config values. 2012-04-15 13:26:01 +02:00
Oskar Hahn
91c9e1e9ab some fixes 2012-04-15 13:10:24 +02:00
Oskar Hahn
6f0fd91ec2 some permission problems 2012-04-15 12:52:59 +02:00
Oskar Hahn
ae5c6b84a8 fixed webkit error be disable a button 2012-04-15 12:40:35 +02:00
Emanuel Schuetze
4d7940cb12 Automated merge with ssh://openslides.org/openslides 2012-04-15 12:39:35 +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
Oskar Hahn
d4d91c8194 fixed printing applications 2012-04-15 12:11:03 +02:00
Oskar Hahn
f4ed79b68d Application view: added link to edit a poll 2012-04-15 11:48:31 +02:00
Oskar Hahn
bf5ae10552 remove Application.poll. projector slide 2012-04-15 11:39:38 +02:00
Oskar Hahn
5678d9dd5e deactivate supporters by default 2012-04-15 11:35:06 +02:00
Oskar Hahn
a46e96841b remove AgendaSummary 2012-04-15 11:33:26 +02:00
Oskar Hahn
1d5455f8f9 frontpage 2012-04-15 11:24:40 +02:00
René Köcher
82993e3da8 Allow clicking on the beamer preview to open the real beamer view. 2012-04-15 10:44:15 +02:00
Emanuel Schuetze
195ddddf7e Automated merge with ssh://openslides.org/openslides 2012-04-15 10:36:51 +02:00
Emanuel Schuetze
c07c2ac853 Print openslides version number in separat config template. 2012-04-15 10:36:37 +02:00
Oskar Hahn
3222e75ab5 debounds from buttons 2012-04-15 10:30:34 +02:00
Emanuel Schuetze
5f2c778880 Automated merge with ssh://openslides.org/openslides 2012-04-15 10:10:35 +02:00
Oskar Hahn
48558504c4 only ask to delete children from agenda-items, if there are some 2012-04-15 10:08:10 +02:00
Emanuel Schuetze
b1c86d4c19 Import template pages: Link to wiki page. 2012-04-15 10:07:45 +02:00
Oskar Hahn
e752ddf3ee fixe error with tabs in DetailView 2012-04-15 10:02:53 +02:00
Oskar Hahn
361bc40821 view for Agenda.item 2012-04-15 09:55:21 +02:00
Emanuel Schuetze
8149686a04 Updated German translation from "Benutzergruppe" to "Benutzerrolle". Some translation fixes. 2012-04-15 09:48:01 +02:00
Oskar Hahn
785bd7c9a4 rename agenda.item.transcript in agenda.item.comment for Version 1.2 2012-04-15 09:41:17 +02:00
Emanuel Schuetze
36ca264931 Remove superuser function. 2012-04-15 09:35:51 +02:00
Emanuel Schuetze
bd3bf9fb6f Updated translation. 2012-04-15 09:27:57 +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
Oskar Hahn
500b418f91 Automated merge with ssh://openslides.de/openslides 2012-04-14 20:10:56 +02:00
Oskar Hahn
3a849880fb code for control view in apps 2012-04-14 20:10:49 +02:00
Emanuel Schuetze
6df95a23f6 Updated translations. 2012-04-14 19:33:50 +02:00
Emanuel Schuetze
df7883deeb Merged. 2012-04-14 19:18:36 +02:00
Emanuel Schuetze
09d2c3112d Minor fixes. 2012-04-14 19:14:51 +02:00
René Köcher
07f81f56f5 Use natural_keys for initial_data.json / fix auto selected permissions in group editor (lost in 409). 2012-04-14 18:53:18 +02:00
Emanuel Schuetze
41899c02f4 Enlarged permissions select field. 2012-04-14 18:41:04 +02:00
Emanuel Schuetze
a73b548032 Minor changes. 2012-04-14 18:13:55 +02:00
Emanuel Schuetze
50df804010 Automated merge with ssh://openslides.org/openslides 2012-04-14 17:50:48 +02:00
Emanuel Schuetze
ad1e87cd99 Some style work. Move countdown to message portlet. 2012-04-14 17:50:31 +02:00
Oskar Hahn
d94baf9760 Automated merge with ssh://openslides.de/openslides 2012-04-14 17:09:23 +02:00
Oskar Hahn
92d2b1db60 ballot methode for AssignmentPoll and ApplicationPoll 2012-04-14 17:09:15 +02:00
Emanuel Schuetze
fc5b738b87 Automated merge with ssh://openslides.org/openslides 2012-04-14 16:17:30 +02:00
Emanuel Schuetze
3ba6f9c26d Projector control: Moved MessagesView to ControlView. Removed messages template. 2012-04-14 16:17:26 +02:00
Oskar Hahn
75b9d6c63d set message id in JS 2012-04-14 16:01:36 +02:00
René Köcher
7e56911aca Ich will meine Anführungszeichen zurück!!! 2012-04-14 15:00:24 +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
15a34fda97 project ProjectorSlide 2012-04-14 11:37:12 +02:00
Oskar Hahn
c0bf5ba822 Automated merge with ssh://openslides.de/openslides 2012-04-14 11:18:54 +02:00
Oskar Hahn
491c65cf24 use app name for projector category 2012-04-14 11:18:47 +02:00
Emanuel Schuetze
a4db8a49dd Automated merge with ssh://openslides.org/openslides 2012-04-14 10:54:31 +02:00
Emanuel Schuetze
4abd79e7b5 Added PDF document title. 2012-04-14 10:54:22 +02:00
René Köcher
d2f9f630c7 Move AnonymousAuth from system to utils. 2012-04-14 09:49:37 +02:00
Oskar Hahn
e8337278a1 Automated merge with ssh://openslides.de/openslides 2012-04-14 09:47:41 +02:00
Oskar Hahn
0de8228537 rewrote message api and countdown 2012-04-14 09:47:34 +02:00
Emanuel Schuetze
e84861211a Fixed login/logout urls. 2012-04-14 09:42:30 +02:00
René Köcher
a792cd4c15 Support for localized permissions on top of the static django model. 2012-04-14 09:34:31 +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
Oskar Hahn
d870b988e9 try to reload the beamer, if the server is down 2012-04-14 09:04:37 +02:00
Emanuel Schuetze
3817a03aa8 Automated merge with ssh://openslides.org/openslides 2012-04-13 23:52:48 +02:00
Emanuel Schuetze
698697a75c Applications: Moved pdf functions from pdf.py to new PDF view in views.py. 2012-04-13 23:52:34 +02:00
René Köcher
cdf3628e8b Check input files for UTF-8 encoding and display an appropriate error if not. 2012-04-13 22:33:47 +02:00
René Köcher
3bea7f1234 Ignore malformed lines in import file (ported from application import). 2012-04-13 22:02:14 +02:00
René Köcher
113d258b3d #85: New import option: set status of all imported applications to 'permit' 2012-04-13 21:55:13 +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
639397028e removed some admin stuff. Fixed version-info, if no mercurial is installed 2012-04-13 16:47:40 +02:00
Oskar Hahn
bb430fd2a7 remove admin, add plugin system for openslides 2012-04-13 14:05:51 +02:00
Oskar Hahn
f889c49c1b some clean up in participant app 2012-04-13 11:35:53 +02:00
Oskar Hahn
f1261ae2a7 merge 2012-04-12 20:13:39 +02:00
Oskar Hahn
d187f341b3 DeleteView in utils.views 2012-04-12 20:11:05 +02:00
René Köcher
733d78373e #84: Participants CSV import deletes applications 2012-04-12 19:11:07 +02:00
Oskar Hahn
9e6aa796ab fixed error in emty poll in assignment 2012-04-12 16:37:04 +02:00
Oskar Hahn
fc95d01d07 some fixes 2012-04-12 16:21:30 +02:00
Oskar Hahn
497a8cdb70 added AjaxView 2012-04-12 14:20:05 +02:00
René Köcher
07a83f142b #84: Participants CSV import deletes applications 2012-04-11 14:49:24 +02:00
Oskar Hahn
3eeae673c0 some small fixes 2012-04-11 10:58:59 +02:00
Emanuel Schuetze
5e6180a465 Some style changes for projector and agenda template. 2012-04-10 21:11:50 +02:00
Emanuel Schuetze
fdc83048f4 More AJAX for projector control template. Moved projector stuff from agenda overview to new control page. 2012-04-10 20:09:10 +02:00
Emanuel Schuetze
83ba0cbcf9 Fixed projector portlet style. 2012-04-02 20:59:17 +02:00
Emanuel Schuetze
c3ada0abdd Updated translation. 2012-04-02 08:44:17 +02:00
Emanuel Schuetze
42820c1254 #83: Merged fix of r365 from default branch into 1.2-dev branch. 2012-04-02 08:37:34 +02:00
Emanuel Schuetze
84e5b3d061 #82: Merged fix of r364 from default branch into 1.2-dev branch. 2012-04-02 08:36:22 +02:00
Emanuel Schuetze
9c13667ff0 #81: Merged fix of r363 from default branch into 1.2-dev branch. 2012-04-02 08:35:10 +02:00
Emanuel Schuetze
4045c79a17 #80: Merged fix of r362 from default branch into 1.2-dev branch. 2012-04-02 08:31:26 +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
bf6a3d2d81 Updated translation 2012-04-02 07:53:32 +02:00
Emanuel Schuetze
95bf4c1cc8 #83: Show total number and percent value of filtered participants. 2012-04-02 07:47:38 +02:00
Emanuel Schuetze
a8fcba0f69 #82: New comment field for participant form (database changes: syncdb required) 2012-04-02 07:38:55 +02:00
Emanuel Schuetze
beb8694cdc #81: Use AJAX code for participant status and superuser links in overview 2012-04-02 07:34:34 +02:00
Emanuel Schuetze
ebbacfd443 #80: New participant status filter 2012-04-02 07:32:42 +02:00
Emanuel Schuetze
e5ef0ac424 #79: Replaced winner cup icon of elected candidates into green check. 2012-04-02 07:30:52 +02:00
Emanuel Schuetze
0406966e55 Removed new file from changeset r279 to clean up Default branch 
(because file already in 1.2-dev branch).
 2012-03-28 15:37:18 +02:00
Emanuel Schuetze
0976206eb4 Reverted changset r279 from Default branch (because it's for 
1.2-dev-branch only).
 2012-03-28 15:20:43 +02:00
Emanuel Schuetze
ac9d31d7d4 Reverted changset r280 from Default branch (because it's for 
1.2-dev-branch only).
 2012-03-28 15:18:18 +02:00
Emanuel Schuetze
c6a40f4dcb Reverted changset r281 from Default branch (because it's for 
1.2-dev-branch only).
 2012-03-28 15:17:50 +02:00
Emanuel Schuetze
a06d20a8d8 Reverted changset r282 from Default branch (because it's for 
1.2-dev-branch only).
 2012-03-28 15:17:29 +02:00
Emanuel Schuetze
a11ed6cfdb Minor template fixes. 2012-03-22 17:30:02 +01:00
Emanuel Schuetze
d4b86574e9 Updated translation. 2012-03-22 17:29:39 +01:00
Emanuel Schuetze
7e48dc737f Scaled Live View. Added active slide icon. 2012-03-21 22:21:23 +01:00
Emanuel Schuetze
d65b20a7fd Fixed tab string. 2012-03-19 09:34:13 +01:00
Oskar Hahn
c4c42611b4 generate tab liste by app list 2012-03-18 17:11:58 +01:00
Oskar Hahn
ad38a8eead put some lines in agenda template in seperate File 2012-03-18 15:11:01 +01:00
Oskar Hahn
f5414b18d2 fixed error in projector Control 2012-03-18 14:35:01 +01:00
Oskar Hahn
282778c8a0 fixed error with permission Mixin 2012-03-18 14:33:53 +01:00
Oskar Hahn
f54cf05fc6 bug in signals 2012-03-17 00:22:46 +01:00
Oskar Hahn
0b137e72cd remove some unused lines from base_system.html 2012-03-16 14:33:19 +01:00
Oskar Hahn
fb17b16fae config pages in apps 2012-03-16 14:31:59 +01:00
Oskar Hahn
ccdce52caa start a way to send messages to the projector. Start to use this api for the countdown 2012-03-16 12:28:42 +01:00
Oskar Hahn
bf6d5fc798 decode config Vars with base64 befor saveing them in the db 2012-03-13 13:03:03 +01:00
Oskar Hahn
2947fff9f6 commit mailinglist test 2012-03-12 18:27:13 +01:00
Oskar Hahn
7a63ec6f10 created model for pojector slides 2012-03-12 18:22:18 +01:00
Emanuel Schuetze
2ab6ff4143 Projector control template: Used portlets instead of accordion. 2012-03-07 06:44:43 +01:00
Emanuel Schuetze
687f5ea710 Automated merge with ssh://openslides.org/openslides 2012-03-06 19:55:26 +01:00
Emanuel Schuetze
8d514e9fcf Renamed SettingView to ControlView. 2012-03-06 19:55:19 +01:00
Oskar Hahn
027655270e Automated merge with ssh://openslides.de/openslides 2012-03-06 12:16:21 +01:00
Oskar Hahn
062e9bd4cb added signals for template-context-manipulation 2012-03-06 12:16:03 +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
50360dde96 side-menu for projector 2012-03-03 11:19:58 +01:00
Oskar Hahn
a25d980f92 publish assignment polls 2012-03-03 11:16:10 +01:00
Oskar Hahn
a69ddffea5 put links in projector settings in categories 2012-03-03 10:47:32 +01:00
Oskar Hahn
654b101dac beamer setting page 2012-03-03 09:11:56 +01:00
Oskar Hahn
a2230c9077 fixed error when deleting item without the children 2012-02-21 13:36:00 +01:00
Oskar Hahn
281450341d some fixes to pdf.py 2012-02-21 13:32:39 +01:00
Oskar Hahn
e9299625ae Automated merge with ssh://openslides.de/openslides 2012-02-21 13:17:58 +01:00
Oskar Hahn
898cab4aa8 Generate Agenda-PDF in a generic View. Added PDFView in utils.views.py 2012-02-21 13:17:42 +01:00
Emanuel Schuetze
c14dcb1679 Added missing template tags (i18n). 2012-02-21 08:21:59 +01:00
Emanuel Schuetze
0cc5d6478d Changed config_get() to config[]. 2012-02-21 08:07:56 +01:00
Oskar Hahn
c55f240e84 some bug fixes 2012-02-20 20:35:12 +01:00
Oskar Hahn
e85822ebc9 updated agenda unittests 2012-02-20 19:39:53 +01:00
Oskar Hahn
4e16c6639b some minor bug fixes 2012-02-20 19:39:26 +01:00
Oskar Hahn
1e7d420485 added utils.forms.py 2012-02-20 18:44:38 +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
8c52ecd669 generic views for the Agenda-App 2012-02-20 17:46:45 +01:00
Oskar Hahn
159e799a22 fixed error when saving a new config-value 2012-02-20 14:51:05 +01:00
Oskar Hahn
fb63d64d02 insert a / between agenda and agenda-url 2012-02-20 14:50:42 +01:00
Oskar Hahn
7e076dc6c4 removed some unneedet dependencies 2012-02-20 00:39:52 +01:00
Oskar Hahn
ab99f791f1 we don't need the item-sort-def anymore 2012-02-20 00:15:44 +01:00
Oskar Hahn
22ef402a50 use django-mptt to ordner the Agenda 
http://django-mptt.github.com
you have to run:
pip install django-mptt
 2012-02-20 00:14:54 +01:00
Oskar Hahn
a404c3fe89 load config at once 2012-02-19 22:20:29 +01:00
Oskar Hahn
70f1cb8b3e use the new poll-api in assignments 2012-02-19 19:27:00 +01:00
Oskar Hahn
5aaa1a53fa addet votes cast and votes invalid to new poll-api 2012-02-19 17:31:17 +01:00
Oskar Hahn
7174e93988 pickle config-values to save complex data 2012-02-18 00:00:56 +01:00
Oskar Hahn
114a68b120 some additions in poll and application-poll 2012-02-15 13:44:55 +01:00
Oskar Hahn
c4874ae6a0 present a poll 2012-02-15 12:36:50 +01:00
Oskar Hahn
bc05b78648 rewrote the config api 2012-02-15 12:04:11 +01:00
Oskar Hahn
77b11d8edf forgot to add some files 2012-02-15 10:46:55 +01:00
Oskar Hahn
9c367509dd reorder poll 2012-02-15 10:43:08 +01:00
Oskar Hahn
0957de83a9 start to rewrite the poll-api 2012-02-14 16:31:21 +01:00
Oskar Hahn
a54ff100d1 cleand the setting-file 2012-02-09 17:35:18 +01:00
Oskar Hahn
6498095e2b create setup.py to install openslides 2012-02-09 16:57:10 +01:00
Oskar Hahn
21a13b4d1a The Version of openslides can be written in openslides/__init__.py 2012-02-09 13:43:39 +01:00
Oskar Hahn
28170becb3 cleand the apenda-app 2012-02-09 02:29:38 +01:00
Oskar Hahn
7808783145 register functions als slide 2012-02-09 01:46:58 +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
8275484d84 some errors occured with the new beamer app in agenda 2012-02-06 10:10:20 +01:00
Oskar Hahn
5f6c96b3e8 assignment and application can be beamt without a item-element 2012-02-03 23:12:28 +01:00
Oskar Hahn
fe2efb03fa import some functions from beamer.api 2012-02-03 20:57:08 +01:00
Oskar Hahn
6273f0ff44 beamer zeug in extra app ausgelagert 2012-02-03 20:49:16 +01:00
Emanuel Schuetze
3992b04dc2 #69: Added missing config option to publish voting results for selected 
winners only.
 2012-01-27 08:51:05 +01:00
Emanuel Schuetze
ff45f48144 Updated website. 2011-12-01 23:23:18 +01:00
Emanuel Schuetze
8ed81db9f2 Application import: Added propper_unicode function to handle 
unicode/ascii mix. Thanks to Rene Koecher!
 2011-11-29 12:10:06 +01:00
Emanuel Schuetze
e91df2b67b Fixed CSV changes: Added support for python 2.5.x. 2011-11-29 11:02:31 +01:00
Emanuel Schuetze
7942de0370 Prepared application template style for using html tags (with 'version.text|safe|linebreaks'). 2011-11-24 21:06:39 +01:00
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
Emanuel Schuetze
57ea883d51 Updated permissions. 2011-09-04 12:33:06 +02:00
Emanuel Schuetze
d1d0e7e9b4 Updated permissions. 2011-09-04 12:21:58 +02:00
Emanuel Schuetze
85d74683e8 Updated translations. 2011-09-04 12:21:38 +02:00
Oskar Hahn
f4f7aa4e57 Automated merge with ssh://oshahn.de/openslides 2011-09-04 10:49:21 +02:00
Oskar Hahn
8089c3c8a9 do not create a new aversion, if only the permission has changed 2011-09-04 10:49:17 +02:00
Emanuel Schuetze
3fc42c6488 Added revision confirm dialog. 2011-09-04 10:43:25 +02:00
Oskar Hahn
da14eca296 application.aid is the permitted aid, or the last aid 2011-09-04 10:34:30 +02:00
Oskar Hahn
89386a4ac7 Automated merge with ssh://oshahn.de/openslides 2011-09-04 10:21:58 +02:00
Oskar Hahn
572782befa default version is the accepted Version 2011-09-04 10:21:54 +02:00
Emanuel Schuetze
9f2929df6b Automated merge with ssh://openslides.org/openslides 2011-09-04 10:21:11 +02:00
Emanuel Schuetze
7271964f59 View aversion accept/reject icons and revision number. 2011-09-04 10:21:06 +02:00
Oskar Hahn
2c6c9b55ee accept old application versions 2011-09-04 10:02:54 +02:00
Oskar Hahn
a89bf9f49b Automated merge with ssh://oshahn.de/openslides 2011-09-04 09:57:30 +02:00
Oskar Hahn
a1d92dc1bb generate username with first and lastname 2011-09-04 09:57:23 +02:00
Emanuel Schuetze
6a1a57efca Added permissions for pdf access. 2011-09-04 09:34:52 +02:00
Emanuel Schuetze
a6652e3fb4 Updated participants list with permissions. 2011-09-04 09:12:15 +02:00
Emanuel Schuetze
262304d1e5 Updated event header. 2011-09-04 08:39:36 +02:00
Emanuel Schuetze
c34cc79a84 Updated circle img path with SITE_ROOT. 2011-09-04 08:31:44 +02:00
Emanuel Schuetze
5e4ba42de3 Imported SITE_ROOT for font path. 2011-09-04 08:23:03 +02:00
Emanuel Schuetze
63c68c9714 Automated merge with ssh://openslides.org/openslides 2011-09-04 00:54:52 +02:00
Emanuel Schuetze
a05b576f9e Print password pdf with url and welcometext. 2011-09-04 00:54:45 +02:00
Oskar Hahn
bd4504b40e typo in agenda 2011-09-04 00:29:23 +02:00
Oskar Hahn
5fc2549fd3 Automated merge with ssh://oshahn.de/openslides 2011-09-04 00:18:17 +02:00
Oskar Hahn
c22d35cd43 scroll and scall the beamer 2011-09-04 00:18:11 +02:00
Emanuel Schuetze
ceb9a3b4c3 PDF: Optimized ballot description for 2 lines. 2011-09-03 23:38:14 +02:00
Emanuel Schuetze
6a991dba0d Removed language selector. Should be used via settings.py now. 2011-09-03 23:37:15 +02:00
Emanuel Schuetze
1b81cfee27 Automated merge with ssh://openslides.org/openslides 2011-09-03 19:49:35 +02:00
Emanuel Schuetze
d0363d7ad9 Added icon for accept/reject application versions. 2011-09-03 19:49:32 +02:00
Oskar Hahn
31e663d274 Automated merge with ssh://oshahn.de/openslides 2011-09-03 19:43:31 +02:00
Oskar Hahn
67f650aee8 error by password reset function 2011-09-03 19:42:43 +02:00
Emanuel Schuetze
1bce678a03 Automated merge with ssh://openslides.org/openslides 2011-09-03 19:25:16 +02:00
Emanuel Schuetze
2ad0754f88 Added and fixed apply buttons. Updated translation. 2011-09-03 19:25:05 +02:00
Oskar Hahn
3c38a02896 requestcontext by error-pages 2011-09-03 19:16:43 +02:00
Oskar Hahn
a7fc2c2b88 show a discreet error when there is an ajax-error on the beamer 2011-09-03 18:50:47 +02:00
Oskar Hahn
4639e77549 apply link redirect to edit-form, if it was a new form 2011-09-03 18:35:19 +02:00
Emanuel Schuetze
ad263ea6a0 Automated merge with ssh://openslides.org/openslides 2011-09-03 18:11:54 +02:00
Oskar Hahn
5543320e0d accept and reject links for applications 2011-09-03 18:11:42 +02:00
Emanuel Schuetze
452d23a16b Automated merge with ssh://openslides.org/openslides 2011-09-03 18:11:15 +02:00
Emanuel Schuetze
ba28afdc49 Added icons to hide/show hidden agenda items. Some style changes. 2011-09-03 18:11:05 +02:00
Oskar Hahn
e849716ee4 default password and reset function 2011-09-03 17:17:29 +02:00
Emanuel Schuetze
762f09197d Updated translations. 2011-09-03 16:36:49 +02:00
Emanuel Schuetze
e23a498b83 Merged. 2011-09-03 16:22:43 +02:00
Emanuel Schuetze
021fb27833 Added apply buttons. Some style changes. Fix permissions. 2011-09-03 16:20:10 +02:00
Oskar Hahn
28785c0ed4 Automated merge with ssh://oshahn.de/openslides 2011-09-03 15:08:26 +02:00
Oskar Hahn
aab2916d6d hide closed elements in the agenda 2011-09-03 15:08:20 +02:00
Emanuel Schuetze
7c866e11e4 Removed ItemPoll and ItemFormPoll. 2011-09-03 14:36:01 +02:00
Emanuel Schuetze
a874e327ac Fixed style. 2011-09-03 14:31:33 +02:00
Emanuel Schuetze
8ef3d485fe Exluded weight field from item forms. 2011-09-03 14:30:56 +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
b626d049fe ask, if by deleting an item, if the childen shoud be deleted as well 2011-09-03 12:45:19 +02:00
Oskar Hahn
e81de0fa48 Automated merge with ssh://oshahn.de/openslides 2011-09-03 12:26:22 +02:00
Oskar Hahn
a32ed1d059 do not show the elected box in assignment edit form 2011-09-03 12:26:14 +02:00
Emanuel Schuetze
a9fd09951b Automated merge with ssh://openslides.org/openslides 2011-09-03 12:16:52 +02:00
Emanuel Schuetze
97228f6558 Show invalid votes in application view. 2011-09-03 12:16:47 +02:00
Oskar Hahn
0c931559a0 apply button in agenda edit form 2011-09-03 12:14:17 +02:00
Oskar Hahn
eaee6f9154 remove the obligation to change the password 2011-09-03 12:14:04 +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
689b6e1706 Automated merge with ssh://openslides.org/openslides 2011-09-03 10:52:36 +02:00
Emanuel Schuetze
ca0c50caef Many improvements for application and assignment poll system. 2011-09-03 10:52:29 +02:00
Emanuel Schuetze
b1b5d9cb70 Removed old poll permissions. 2011-09-03 01:46:56 +02:00
Emanuel Schuetze
e752e05b0f Removed unnecessary parts from poll system. Needs new development in future. 2011-09-03 01:40:06 +02:00
Emanuel Schuetze
ed40977403 Removed reduced agenda pdf. Not useable. 2011-09-03 01:24:50 +02:00
Emanuel Schuetze
2278ddca54 DB change: Changed voteinvalid to votesinvalid. 2011-09-03 00:43:09 +02:00
Emanuel Schuetze
f24cc7c0c1 Minor fixes 2011-09-03 00:42:37 +02:00
Oskar Hahn
2a89ccca5a merge 2011-09-02 20:46:52 +02:00
Oskar Hahn
a9775bdd73 api for ajax requests 2011-09-02 20:46:24 +02:00
Emanuel Schuetze
6458a69324 Reduced application poll title. 2011-09-02 17:40:02 +02:00
Emanuel Schuetze
1811f0108c PDF: Restructured ballot stylesheets. 2011-09-02 17:39:32 +02:00
Emanuel Schuetze
590d56a80e PDF: Optimized application print function. 2011-09-02 16:34:12 +02:00
Emanuel Schuetze
8e325e5361 Restructured pdf stylesheets. 2011-09-02 15:54:13 +02:00
Oskar Hahn
462cba2416 close and open a slide with ajax 2011-08-31 23:47:31 +02:00
Oskar Hahn
4e03fe90bc active Item by ajax and prepared other ajax features 2011-08-31 18:25:03 +02:00
Oskar Hahn
628de1f954 typo 2011-08-31 14:32:02 +02:00
Oskar Hahn
78bd65a700 add knockout api 2011-08-31 14:26:46 +02:00
Oskar Hahn
67c6fdba29 use a-tag instead of onclick for nojs use 2011-08-31 14:17:11 +02:00
Emanuel Schuetze
b2cd48d971 View event date and location if not empty. 2011-08-03 22:52:45 +02:00
Emanuel Schuetze
d41a1c4791 Fixed: parent form field is not required. 2011-08-02 21:40:08 +02:00
Oskar Hahn
3db6a12024 Add code 2011-07-31 10:46:29 +02:00