23df763b1f
fix message issus: #134 , also defined some default config-values
2012-04-18 18:35:02 +02:00
67db762575
Automated merge with ssh://openslides.org/openslides
2012-04-18 18:29:34 +02:00
4ce8facd1a
#98 : Add new filter for active/inactive items.
2012-04-18 18:29:31 +02:00
0dde1738cf
fixed active line #88
2012-04-18 18:07:24 +02:00
e9e9fa54b2
fixed problem with deleting the default permissions
2012-04-18 16:57:33 +02:00
49e2f73df4
#92 preview for slides
2012-04-18 15:47:51 +02:00
6798050ded
added help_message
2012-04-18 15:04:16 +02:00
67384d0644
indent items in control view
2012-04-18 14:53:19 +02:00
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
fbaa88c23a
#99 fixed problem with agenda-items and mptt
2012-04-18 14:36:03 +02:00
be6a63e48c
show version from plugins
2012-04-18 09:33:09 +02:00
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
a3d7cc98a9
#110 error in application pdf printing
2012-04-17 17:47:37 +02:00
189cfa1309
translate poll values
2012-04-17 17:35:50 +02:00
0a8d40e2ac
slideUp read messages
2012-04-17 14:45:25 +02:00
56f1a15cac
added function to set messages in JavaScript
2012-04-17 13:41:43 +02:00
6aa241b268
fixed error in get_active_slide()
2012-04-17 12:07:32 +02:00
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
da8c3c0bba
show pollresults in application projector
2012-04-16 17:21:41 +02:00
03792c0b05
put projector message in the center of the presentation
2012-04-16 17:14:39 +02:00
7d16717ca8
clean button for message
2012-04-16 16:38:47 +02:00
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
3bceca2359
use plugin.NAME for submenu-title in config-tab
2012-04-16 11:36:50 +02:00
80c5bfbba9
translation in JS-files
2012-04-16 11:12:21 +02:00
c1cd0a2805
send class, not object, for template_manipulation
2012-04-16 11:11:45 +02:00
81f4a8c5d5
Automated merge with ssh://openslides.org/openslides
2012-04-15 16:13:32 +02:00
84731a07d5
Updated application view submenu.
2012-04-15 16:13:26 +02:00
beaa3e341a
Create portable win32 binary distribution
2012-04-15 16:04:08 +02:00
92305bf363
use item for item sid
2012-04-15 16:02:13 +02:00
d2d3725eb6
fix agenda.test
2012-04-15 16:00:25 +02:00
bc31a2df1a
Automated merge with ssh://openslides.org/openslides
2012-04-15 15:53:10 +02:00
f44f2723dc
Added link to activate agenda item in overview table.
2012-04-15 15:53:05 +02:00
90038c1ad2
fix error by activating the Agenda
2012-04-15 15:46:32 +02:00
8b7fdc7a5c
Automated merge with ssh://openslides.org/openslides
2012-04-15 15:21:23 +02:00
4967b2b358
New agenda view template.
2012-04-15 15:21:19 +02:00
a3808c7b30
fixed problem in assignment poll
2012-04-15 14:58:05 +02:00
b620c0afb7
Add 'zoom' css attribute if we detect MSIE.
2012-04-15 14:51:50 +02:00
da9861b9f7
Automated merge with ssh://openslides.org/openslides
2012-04-15 14:28:34 +02:00
0657ff340d
Show clickable done action in first column in agenda overview.
2012-04-15 14:28:01 +02:00
82d4a2de4b
Try to get a working beamer preview for more browsers.
2012-04-15 14:27:27 +02:00
ddeaea88c4
Moved agenda pdf link to submenu.
2012-04-15 14:16:00 +02:00
abf7721f3f
Filled frontpage with config values.
2012-04-15 13:26:01 +02:00
91c9e1e9ab
some fixes
2012-04-15 13:10:24 +02:00
6f0fd91ec2
some permission problems
2012-04-15 12:52:59 +02:00
ae5c6b84a8
fixed webkit error be disable a button
2012-04-15 12:40:35 +02:00
4d7940cb12
Automated merge with ssh://openslides.org/openslides
2012-04-15 12:39:35 +02:00
95d5929449
Added participant and version config page. Moved system settings to general. Some style work.
2012-04-15 12:39:28 +02:00
d4d91c8194
fixed printing applications
2012-04-15 12:11:03 +02:00
f4ed79b68d
Application view: added link to edit a poll
2012-04-15 11:48:31 +02:00
bf5ae10552
remove Application.poll. projector slide
2012-04-15 11:39:38 +02:00
5678d9dd5e
deactivate supporters by default
2012-04-15 11:35:06 +02:00
a46e96841b
remove AgendaSummary
2012-04-15 11:33:26 +02:00
1d5455f8f9
frontpage
2012-04-15 11:24:40 +02:00
82993e3da8
Allow clicking on the beamer preview to open the real beamer view.
2012-04-15 10:44:15 +02:00
195ddddf7e
Automated merge with ssh://openslides.org/openslides
2012-04-15 10:36:51 +02:00
c07c2ac853
Print openslides version number in separat config template.
2012-04-15 10:36:37 +02:00
3222e75ab5
debounds from buttons
2012-04-15 10:30:34 +02:00
5f2c778880
Automated merge with ssh://openslides.org/openslides
2012-04-15 10:10:35 +02:00
48558504c4
only ask to delete children from agenda-items, if there are some
2012-04-15 10:08:10 +02:00
b1c86d4c19
Import template pages: Link to wiki page.
2012-04-15 10:07:45 +02:00
e752ddf3ee
fixe error with tabs in DetailView
2012-04-15 10:02:53 +02:00
361bc40821
view for Agenda.item
2012-04-15 09:55:21 +02:00
8149686a04
Updated German translation from "Benutzergruppe" to "Benutzerrolle". Some translation fixes.
2012-04-15 09:48:01 +02:00
785bd7c9a4
rename agenda.item.transcript in agenda.item.comment for Version 1.2
2012-04-15 09:41:17 +02:00
36ca264931
Remove superuser function.
2012-04-15 09:35:51 +02:00
bd3bf9fb6f
Updated translation.
2012-04-15 09:27:57 +02:00
e9ad4de11f
Minor template fix..
2012-04-14 22:45:33 +02:00
aef2a08666
Minor template fixes.
2012-04-14 22:41:02 +02:00
500b418f91
Automated merge with ssh://openslides.de/openslides
2012-04-14 20:10:56 +02:00
3a849880fb
code for control view in apps
2012-04-14 20:10:49 +02:00
6df95a23f6
Updated translations.
2012-04-14 19:33:50 +02:00
df7883deeb
Merged.
2012-04-14 19:18:36 +02:00
09d2c3112d
Minor fixes.
2012-04-14 19:14:51 +02:00
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
41899c02f4
Enlarged permissions select field.
2012-04-14 18:41:04 +02:00
a73b548032
Minor changes.
2012-04-14 18:13:55 +02:00
50df804010
Automated merge with ssh://openslides.org/openslides
2012-04-14 17:50:48 +02:00
ad1e87cd99
Some style work. Move countdown to message portlet.
2012-04-14 17:50:31 +02:00
d94baf9760
Automated merge with ssh://openslides.de/openslides
2012-04-14 17:09:23 +02:00
92d2b1db60
ballot methode for AssignmentPoll and ApplicationPoll
2012-04-14 17:09:15 +02:00
fc5b738b87
Automated merge with ssh://openslides.org/openslides
2012-04-14 16:17:30 +02:00
3ba6f9c26d
Projector control: Moved MessagesView to ControlView. Removed messages template.
2012-04-14 16:17:26 +02:00
75b9d6c63d
set message id in JS
2012-04-14 16:01:36 +02:00
7e56911aca
Ich will meine Anführungszeichen zurück!!!
2012-04-14 15:00:24 +02:00
f674897505
Split static files in application specific directories and use django 1.4 staticfiles app.
2012-04-14 14:51:56 +02:00
fbdcc5e0b4
Automated merge with ssh://openslides.de/openslides
2012-04-14 14:31:15 +02:00
535795391d
remove default permission after syncdb
2012-04-14 14:31:09 +02:00
1528ab90c6
Merged.
2012-04-14 14:27:31 +02:00
d192ac4952
Added AssignmentPollDelete View. Moved Assignment pdf functions to assignment's views.py
2012-04-14 14:24:13 +02:00
6f377453bc
rename system in config. Add default config in each apps
2012-04-14 12:52:56 +02:00
15a34fda97
project ProjectorSlide
2012-04-14 11:37:12 +02:00
c0bf5ba822
Automated merge with ssh://openslides.de/openslides
2012-04-14 11:18:54 +02:00
491c65cf24
use app name for projector category
2012-04-14 11:18:47 +02:00
a4db8a49dd
Automated merge with ssh://openslides.org/openslides
2012-04-14 10:54:31 +02:00
4abd79e7b5
Added PDF document title.
2012-04-14 10:54:22 +02:00
d2f9f630c7
Move AnonymousAuth from system to utils.
2012-04-14 09:49:37 +02:00
e8337278a1
Automated merge with ssh://openslides.de/openslides
2012-04-14 09:47:41 +02:00
0de8228537
rewrote message api and countdown
2012-04-14 09:47:34 +02:00
e84861211a
Fixed login/logout urls.
2012-04-14 09:42:30 +02:00
a792cd4c15
Support for localized permissions on top of the static django model.
2012-04-14 09:34:31 +02:00
7e12e1d5e2
Support for localized permissions on top of the untranslated django model.
2012-04-14 09:28:28 +02:00
d870b988e9
try to reload the beamer, if the server is down
2012-04-14 09:04:37 +02:00
3817a03aa8
Automated merge with ssh://openslides.org/openslides
2012-04-13 23:52:48 +02:00
698697a75c
Applications: Moved pdf functions from pdf.py to new PDF view in views.py.
2012-04-13 23:52:34 +02:00
cdf3628e8b
Check input files for UTF-8 encoding and display an appropriate error if not.
2012-04-13 22:33:47 +02:00
3bea7f1234
Ignore malformed lines in import file (ported from application import).
2012-04-13 22:02:14 +02:00
113d258b3d
#85 : New import option: set status of all imported applications to 'permit'
2012-04-13 21:55:13 +02:00
a1c5766e7a
Adjusted app prefix in urls.py (outsource in global urls.py). Some code formatting.
2012-04-13 21:43:16 +02:00
639397028e
removed some admin stuff. Fixed version-info, if no mercurial is installed
2012-04-13 16:47:40 +02:00
bb430fd2a7
remove admin, add plugin system for openslides
2012-04-13 14:05:51 +02:00
f889c49c1b
some clean up in participant app
2012-04-13 11:35:53 +02:00
f1261ae2a7
merge
2012-04-12 20:13:39 +02:00
d187f341b3
DeleteView in utils.views
2012-04-12 20:11:05 +02:00
733d78373e
#84 : Participants CSV import deletes applications
2012-04-12 19:11:07 +02:00
9e6aa796ab
fixed error in emty poll in assignment
2012-04-12 16:37:04 +02:00
fc95d01d07
some fixes
2012-04-12 16:21:30 +02:00
497a8cdb70
added AjaxView
2012-04-12 14:20:05 +02:00
3eeae673c0
some small fixes
2012-04-11 10:58:59 +02:00
5e6180a465
Some style changes for projector and agenda template.
2012-04-10 21:11:50 +02:00
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
83ba0cbcf9
Fixed projector portlet style.
2012-04-02 20:59:17 +02:00
c3ada0abdd
Updated translation.
2012-04-02 08:44:17 +02:00
42820c1254
#83 : Merged fix of r365 from default branch into 1.2-dev branch.
2012-04-02 08:37:34 +02:00
84e5b3d061
#82 : Merged fix of r364 from default branch into 1.2-dev branch.
2012-04-02 08:36:22 +02:00
9c13667ff0
#81 : Merged fix of r363 from default branch into 1.2-dev branch.
2012-04-02 08:35:10 +02:00
4045c79a17
#80 : Merged fix of r362 from default branch into 1.2-dev branch.
2012-04-02 08:31:26 +02:00
c2ec9e958f
#79 : Merged fix of r361 from default branch into 1.2-dev branch.
2012-04-02 08:30:28 +02:00
a11ed6cfdb
Minor template fixes.
2012-03-22 17:30:02 +01:00
d4b86574e9
Updated translation.
2012-03-22 17:29:39 +01:00
7e48dc737f
Scaled Live View. Added active slide icon.
2012-03-21 22:21:23 +01:00
d65b20a7fd
Fixed tab string.
2012-03-19 09:34:13 +01:00
c4c42611b4
generate tab liste by app list
2012-03-18 17:11:58 +01:00
ad38a8eead
put some lines in agenda template in seperate File
2012-03-18 15:11:01 +01:00
f5414b18d2
fixed error in projector Control
2012-03-18 14:35:01 +01:00
282778c8a0
fixed error with permission Mixin
2012-03-18 14:33:53 +01:00
f54cf05fc6
bug in signals
2012-03-17 00:22:46 +01:00
0b137e72cd
remove some unused lines from base_system.html
2012-03-16 14:33:19 +01:00
fb17b16fae
config pages in apps
2012-03-16 14:31:59 +01:00
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
bf6d5fc798
decode config Vars with base64 befor saveing them in the db
2012-03-13 13:03:03 +01:00
2947fff9f6
commit mailinglist test
2012-03-12 18:27:13 +01:00
7a63ec6f10
created model for pojector slides
2012-03-12 18:22:18 +01:00
2ab6ff4143
Projector control template: Used portlets instead of accordion.
2012-03-07 06:44:43 +01:00
687f5ea710
Automated merge with ssh://openslides.org/openslides
2012-03-06 19:55:26 +01:00
8d514e9fcf
Renamed SettingView to ControlView.
2012-03-06 19:55:19 +01:00
027655270e
Automated merge with ssh://openslides.de/openslides
2012-03-06 12:16:21 +01:00
062e9bd4cb
added signals for template-context-manipulation
2012-03-06 12:16:03 +01:00
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
50360dde96
side-menu for projector
2012-03-03 11:19:58 +01:00
a25d980f92
publish assignment polls
2012-03-03 11:16:10 +01:00
a69ddffea5
put links in projector settings in categories
2012-03-03 10:47:32 +01:00
654b101dac
beamer setting page
2012-03-03 09:11:56 +01:00
a2230c9077
fixed error when deleting item without the children
2012-02-21 13:36:00 +01:00
281450341d
some fixes to pdf.py
2012-02-21 13:32:39 +01:00
e9299625ae
Automated merge with ssh://openslides.de/openslides
2012-02-21 13:17:58 +01:00
898cab4aa8
Generate Agenda-PDF in a generic View. Added PDFView in utils.views.py
2012-02-21 13:17:42 +01:00
c14dcb1679
Added missing template tags (i18n).
2012-02-21 08:21:59 +01:00
0cc5d6478d
Changed config_get() to config[].
2012-02-21 08:07:56 +01:00
c55f240e84
some bug fixes
2012-02-20 20:35:12 +01:00
e85822ebc9
updated agenda unittests
2012-02-20 19:39:53 +01:00
4e16c6639b
some minor bug fixes
2012-02-20 19:39:26 +01:00
1e7d420485
added utils.forms.py
2012-02-20 18:44:38 +01:00
8c597a2eb3
load form-css-classes from utils.forms.py instead to define it on every form
2012-02-20 18:44:02 +01:00
8c52ecd669
generic views for the Agenda-App
2012-02-20 17:46:45 +01:00
159e799a22
fixed error when saving a new config-value
2012-02-20 14:51:05 +01:00
fb63d64d02
insert a / between agenda and agenda-url
2012-02-20 14:50:42 +01:00
7e076dc6c4
removed some unneedet dependencies
2012-02-20 00:39:52 +01:00
ab99f791f1
we don't need the item-sort-def anymore
2012-02-20 00:15:44 +01:00
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
a404c3fe89
load config at once
2012-02-19 22:20:29 +01:00
70f1cb8b3e
use the new poll-api in assignments
2012-02-19 19:27:00 +01:00
5aaa1a53fa
addet votes cast and votes invalid to new poll-api
2012-02-19 17:31:17 +01:00
7174e93988
pickle config-values to save complex data
2012-02-18 00:00:56 +01:00
114a68b120
some additions in poll and application-poll
2012-02-15 13:44:55 +01:00
c4874ae6a0
present a poll
2012-02-15 12:36:50 +01:00
bc05b78648
rewrote the config api
2012-02-15 12:04:11 +01:00
77b11d8edf
forgot to add some files
2012-02-15 10:46:55 +01:00
9c367509dd
reorder poll
2012-02-15 10:43:08 +01:00
0957de83a9
start to rewrite the poll-api
2012-02-14 16:31:21 +01:00
a54ff100d1
cleand the setting-file
2012-02-09 17:35:18 +01:00
6498095e2b
create setup.py to install openslides
2012-02-09 16:57:10 +01:00
21a13b4d1a
The Version of openslides can be written in openslides/__init__.py
2012-02-09 13:43:39 +01:00
28170becb3
cleand the apenda-app
2012-02-09 02:29:38 +01:00
7808783145
register functions als slide
2012-02-09 01:46:58 +01:00
8c27c731f8
rename Element to Slide
2012-02-06 22:22:16 +01:00
16c37661f7
renamed beamer in projector
2012-02-06 22:08:08 +01:00
8275484d84
some errors occured with the new beamer app in agenda
2012-02-06 10:10:20 +01:00
5f6c96b3e8
assignment and application can be beamt without a item-element
2012-02-03 23:12:28 +01:00
fe2efb03fa
import some functions from beamer.api
2012-02-03 20:57:08 +01:00
6273f0ff44
beamer zeug in extra app ausgelagert
2012-02-03 20:49:16 +01:00
3992b04dc2
#69 : Added missing config option to publish voting results for selected
...
winners only.
2012-01-27 08:51:05 +01:00
ff45f48144
Updated website.
2011-12-01 23:23:18 +01:00
8ed81db9f2
Application import: Added propper_unicode function to handle
...
unicode/ascii mix. Thanks to Rene Koecher!
2011-11-29 12:10:06 +01:00
e91df2b67b
Fixed CSV changes: Added support for python 2.5.x.
2011-11-29 11:02:31 +01:00
7942de0370
Prepared application template style for using html tags (with 'version.text|safe|linebreaks').
2011-11-24 21:06:39 +01:00
a2db589272
Automated merge with ssh://openslides.org/openslides
2011-11-24 20:24:27 +01:00
03bca90511
Extend patchup for builtin excel dialect
2011-11-24 20:24:13 +01:00
8ef0b0ad81
Merged.
2011-11-24 19:53:03 +01:00
8d21b8d831
Participant edit/new form: Changed default value of gender and type to blank/not specified.
2011-11-24 19:51:16 +01:00
72de1dce74
Fixed missing form invalid error message.
2011-11-24 19:42:32 +01:00
Oskar Hahn