Commit Graph

104 Commits

Author SHA1 Message Date
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
Emanuel Schuetze
b1c86d4c19 Import template pages: Link to wiki page. 2012-04-15 10:07:45 +02:00
Emanuel Schuetze
09d2c3112d Minor fixes. 2012-04-14 19:14:51 +02:00
Oskar Hahn
92d2b1db60 ballot methode for AssignmentPoll and ApplicationPoll 2012-04-14 17:09:15 +02:00
René Köcher
f674897505 Split static files in application specific directories and use django 1.4 staticfiles app. 2012-04-14 14:51:56 +02:00
Oskar Hahn
535795391d remove default permission after syncdb 2012-04-14 14:31:09 +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
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
4abd79e7b5 Added PDF document title. 2012-04-14 10:54:22 +02:00
René Köcher
7e12e1d5e2 Support for localized permissions on top of the untranslated django model. 2012-04-14 09:28:28 +02:00
Emanuel Schuetze
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
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
bb430fd2a7 remove admin, add plugin system for openslides 2012-04-13 14:05:51 +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
fc95d01d07 some fixes 2012-04-12 16:21:30 +02:00
Oskar Hahn
497a8cdb70 added AjaxView 2012-04-12 14:20:05 +02: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
fb17b16fae config pages in apps 2012-03-16 14:31:59 +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
654b101dac beamer setting page 2012-03-03 09:11:56 +01:00
Emanuel Schuetze
c14dcb1679 Added missing template tags (i18n). 2012-02-21 08:21:59 +01:00
Oskar Hahn
8c597a2eb3 load form-css-classes from utils.forms.py instead to define it on every form 2012-02-20 18:44:02 +01:00
Oskar Hahn
70f1cb8b3e use the new poll-api in assignments 2012-02-19 19:27:00 +01:00
Oskar Hahn
5aaa1a53fa addet votes cast and votes invalid to new poll-api 2012-02-19 17:31:17 +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
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
6498095e2b create setup.py to install openslides 2012-02-09 16:57:10 +01:00
Oskar Hahn
8c27c731f8 rename Element to Slide 2012-02-06 22:22:16 +01:00
Oskar Hahn
16c37661f7 renamed beamer in projector 2012-02-06 22:08:08 +01:00
Oskar Hahn
5f6c96b3e8 assignment and application can be beamt without a item-element 2012-02-03 23:12:28 +01:00
Emanuel Schuetze
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
7942de0370 Prepared application template style for using html tags (with 'version.text|safe|linebreaks'). 2011-11-24 21:06:39 +01:00
Emanuel Schuetze
8ef0b0ad81 Merged. 2011-11-24 19:53:03 +01:00