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 |
|
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
|
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 |
|