Commit Graph

4055 Commits

Author SHA1 Message Date
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
Emanuel Schuetze
aea3b5803a Updated permissions in initial_data.json. 2012-04-14 19:13:36 +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