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
|
efb3774beb
|
Automated merge with ssh://openslides.de/openslides
|
2012-02-20 17:47:13 +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 |
|
Emanuel Schuetze
|
afd5e5681a
|
Updated INSTALL (Simplify windows instruction to 32bit, added missing django-mptt to
linux instruction)
|
2012-02-20 07:56:49 +01:00 |
|
Oskar Hahn
|
7e076dc6c4
|
removed some unneedet dependencies
|
2012-02-20 00:39:52 +01:00 |
|
Oskar Hahn
|
e2a45d1a29
|
put django-mptt in INSTALL
|
2012-02-20 00:17:53 +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
|
3472563ea1
|
merge
|
2012-02-06 21:36:58 +01:00 |
|
Oskar Hahn
|
65887c8c21
|
remove old dependency from INSTALL
|
2012-02-06 21:32:30 +01:00 |
|
Oskar Hahn
|
baebf992ff
|
thanks for django
|
2012-02-06 21:29:59 +01:00 |
|
Oskar Hahn
|
5eb9aa8123
|
create branch 1.2-dev
|
2012-02-06 21:22:07 +01:00 |
|