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