Oskar Hahn
|
bd64a6cb5c
|
Merge branch 'stable/1.2.x'
Conflicts:
openslides/application/models.py
openslides/application/views.py
openslides/participant/forms.py
openslides/participant/views.py
|
2012-08-13 19:16:42 +02:00 |
Oskar Hahn
|
87af568eeb
|
redesign the DeleteView
Append a QuestionMixin to send a question via the django message api
|
2012-08-10 21:00:13 +02:00 |
Oskar Hahn
|
c52f8f3ca7
|
changed application to motion and permitted to authorized in message-strings
|
2012-08-05 22:31:20 +02:00 |
Emanuel Schuetze
|
bf5181e241
|
Fixed missing translation in PDF title and filename.
|
2012-07-23 12:57:47 +02:00 |
Oskar Hahn
|
debaa505fb
|
fix problems with reportlab and ugettext_lazy
|
2012-07-10 12:11:07 +02:00 |
Oskar Hahn
|
8d961f4940
|
fix translation by using ugettext_lazy
|
2012-07-10 01:33:03 +02:00 |
Oskar Hahn
|
29d25d30d6
|
cleanup the agenda app
|
2012-07-04 12:50:33 +02:00 |
Oskar Hahn
|
00eb365b91
|
rewrote active_slide in generic view
also reordert some imports
|
2012-07-01 15:35:05 +02:00 |
Oskar Hahn
|
3d1e4f5489
|
#216 delete releated agenda-item, if the releated object (application or assignment) is deleted
|
2012-06-23 11:41:32 +02:00 |
Oskar Hahn
|
239f328372
|
rewrote projector-widget system
|
2012-06-11 13:43:48 +02:00 |
Emanuel Schuetze
|
822264ef7b
|
#158: Added success notification for ItemCreate/ItemUpdate View.
|
2012-04-27 21:36:12 +02:00 |
René Köcher
|
7b7f43b04a
|
#97: Countdown: move countdown config input field from config tab to portlet
|
2012-04-26 12:43:35 +02:00 |
Emanuel Schuetze
|
7ef298881d
|
Updated license header.
|
2012-04-25 22:29:19 +02:00 |
Oskar Hahn
|
4e904c7356
|
now it is possible to create a item, witch is realted to another object, for example an application.
|
2012-04-19 12:46:04 +02:00 |
Oskar Hahn
|
fbaa88c23a
|
#99 fixed problem with agenda-items and mptt
|
2012-04-18 14:36:03 +02:00 |
Oskar Hahn
|
a46e96841b
|
remove AgendaSummary
|
2012-04-15 11:33:26 +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 |
Oskar Hahn
|
361bc40821
|
view for Agenda.item
|
2012-04-15 09:55:21 +02:00 |
Oskar Hahn
|
6f377453bc
|
rename system in config. Add default config in each apps
|
2012-04-14 12:52:56 +02:00 |
Emanuel Schuetze
|
4abd79e7b5
|
Added PDF document title.
|
2012-04-14 10:54:22 +02: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 |
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 |
Oskar Hahn
|
a2230c9077
|
fixed error when deleting item without the children
|
2012-02-21 13:36:00 +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 |
Oskar Hahn
|
4e16c6639b
|
some minor bug fixes
|
2012-02-20 19:39:26 +01:00 |
Oskar Hahn
|
8c52ecd669
|
generic views for the Agenda-App
|
2012-02-20 17:46:45 +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
|
bc05b78648
|
rewrote the config api
|
2012-02-15 12:04:11 +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
|
8275484d84
|
some errors occured with the new beamer app in agenda
|
2012-02-06 10:10:20 +01:00 |
Oskar Hahn
|
5f6c96b3e8
|
assignment and application can be beamt without a item-element
|
2012-02-03 23:12:28 +01:00 |
Oskar Hahn
|
fe2efb03fa
|
import some functions from beamer.api
|
2012-02-03 20:57:08 +01:00 |
Oskar Hahn
|
6273f0ff44
|
beamer zeug in extra app ausgelagert
|
2012-02-03 20:49:16 +01:00 |
Emanuel Schuetze
|
3992b04dc2
|
#69: Added missing config option to publish voting results for selected
winners only.
|
2012-01-27 08:51:05 +01:00 |
Emanuel Schuetze
|
076699ff45
|
#52: Added countdown on projector view with control unit (agenda overview) and time variable (general settings).
|
2011-11-09 21:16:02 +01:00 |
Emanuel Schuetze
|
54b148a704
|
Splitted up hidden agenda items in new table section.
|
2011-09-21 21:23:22 +02:00 |
Emanuel Schuetze
|
bd9891fe5e
|
Show results for elected candidates only (assignment beamer view).
|
2011-09-21 21:21:01 +02:00 |
Emanuel Schuetze
|
adebbf4125
|
Automated merge with ssh://openslides.org/openslides
|
2011-09-08 12:30:40 +02:00 |
Emanuel Schuetze
|
5a3f336cdf
|
Added "published" attribute for poll object. Adjusted assignment
views and templates.
|
2011-09-08 12:30:34 +02:00 |
Oskar Hahn
|
508be2f4eb
|
beamer clean link
|
2011-09-08 09:23:21 +02:00 |
Emanuel Schuetze
|
1f5d86a0fc
|
Show assignment vote results on projector view.
|
2011-09-07 23:25:59 +02:00 |
Emanuel Schuetze
|
0b17ab10fe
|
Fixed candidates order in beamer view. Some style changes.
|
2011-09-05 20:47:55 +02:00 |
Emanuel Schuetze
|
57ea883d51
|
Updated permissions.
|
2011-09-04 12:33:06 +02:00 |
Emanuel Schuetze
|
d1d0e7e9b4
|
Updated permissions.
|
2011-09-04 12:21:58 +02:00 |
Oskar Hahn
|
c22d35cd43
|
scroll and scall the beamer
|
2011-09-04 00:18:11 +02:00 |