Norman Jäckel
|
e1b149cde3
|
New config app. Apps only have to define config vars once. Config pages, forms and so on are created automaticly.
Changes after some reviews are done.
Problematic is still that the JS can not be moved to an extra file because of the template tags in the code.
|
2013-03-28 15:31:13 +01:00 |
|
Oskar Hahn
|
4f3f917812
|
some small code design changes
|
2013-02-18 18:56:37 +01:00 |
|
Stefan Frauenknecht
|
1d1d72d45a
|
Fixed if condition with duration property which can be None
|
2013-02-16 11:55:40 +01:00 |
|
Stefan Frauenknecht
|
8103c09b81
|
PEP8 errors resolved
|
2013-02-16 10:41:22 +01:00 |
|
Emanuel Schuetze
|
4f60160667
|
Added missing success_url_name.
|
2013-02-15 08:50:42 +01:00 |
|
Emanuel Schuetze
|
e101fb8212
|
Merge branch 'master' into agenda-orga-items
Conflicts:
openslides/agenda/static/styles/agenda.css
openslides/agenda/templates/agenda/config.html
openslides/agenda/templates/agenda/item_row.html
openslides/agenda/templates/agenda/overview.html
openslides/locale/de/LC_MESSAGES/django.mo
openslides/locale/de/LC_MESSAGES/django.po
openslides/static/styles/base.css
requirements.txt
|
2013-02-11 22:36:19 +01:00 |
|
Stefan Frauenknecht
|
d6084f7c8b
|
Create items with duration loger than 23:59. Show start and end date. Duration has tooltip showing end date and time.
|
2013-02-05 16:36:57 +01:00 |
|
Oskar Hahn
|
90614cc637
|
Updated some views for the new utils.views style
|
2013-02-03 19:43:36 +01:00 |
|
Oskar Hahn
|
139ba74459
|
Merge remote-tracking branch 'emanuel/newtemplate' into new_template
Conflicts:
.travis.yml
INSTALL.txt
openslides/agenda/templates/agenda/base_agenda.html
openslides/agenda/templates/agenda/edit.html
openslides/agenda/templates/agenda/item_row.html
openslides/agenda/templates/agenda/overview.html
openslides/agenda/templates/agenda/widget.html
openslides/assignment/templates/assignment/base_assignment.html
openslides/assignment/templates/assignment/config.html
openslides/assignment/templates/assignment/edit.html
openslides/assignment/templates/assignment/overview.html
openslides/assignment/templates/assignment/poll_view.html
openslides/assignment/templates/assignment/view.html
openslides/assignment/templates/assignment/widget.html
openslides/config/templates/config/general.html
openslides/motion/templates/motion/base_motion.html
openslides/motion/templates/motion/config.html
openslides/motion/templates/motion/edit.html
openslides/motion/templates/motion/import.html
openslides/motion/templates/motion/overview.html
openslides/motion/templates/motion/poll_view.html
openslides/motion/templates/motion/view.html
openslides/motion/templates/motion/widget.html
openslides/motion/views.py
openslides/participant/templates/participant/base_participant.html
openslides/participant/templates/participant/config.html
openslides/participant/templates/participant/edit.html
openslides/participant/templates/participant/group_edit.html
openslides/participant/templates/participant/group_widget.html
openslides/participant/templates/participant/import.html
openslides/participant/templates/participant/login.html
openslides/participant/templates/participant/overview.html
openslides/participant/templates/participant/password_change.html
openslides/participant/templates/participant/settings.html
openslides/participant/templates/participant/user_widget.html
openslides/projector/templates/projector/base_projector.html
openslides/projector/templates/projector/control_countdown.html
openslides/projector/templates/projector/control_overlay_message.html
openslides/projector/templates/projector/custom_slide_widget.html
openslides/projector/templates/projector/live_view_widget.html
openslides/projector/templates/projector/new.html
openslides/projector/templates/projector/overlay_widget.html
openslides/templates/base.html
openslides/utils/template.py
openslides/utils/views.py
requirements.txt
|
2013-02-03 19:03:18 +01:00 |
|
Oskar Hahn
|
6c3eb0f765
|
fixed urls in views from the participant app
|
2013-02-01 17:35:27 +01:00 |
|
Stefan Frauenknecht
|
7f03e02e9a
|
Item type changed from CharField to IntegerField. Constant type names added.
|
2013-02-01 15:13:40 +01:00 |
|
Stefan Frauenknecht
|
9746b3818f
|
Rework code to ommit unnecessary filter call.
|
2013-01-31 20:32:29 +01:00 |
|
Stefan Frauenknecht
|
3dfd16558a
|
Blanks removed
|
2013-01-31 18:35:52 +01:00 |
|
Stefan Frauenknecht
|
65ebcbc991
|
#41 Time for each agenda item finished
|
2013-01-30 17:39:53 +01:00 |
|
Stefan Frauenknecht
|
bc9dcffff4
|
#41 Time for each agenda item
|
2013-01-29 14:28:42 +01:00 |
|
Stefan Frauenknecht
|
aee24425bc
|
Ticket 433 - Organisational items
|
2013-01-05 23:52:29 +01:00 |
|
Emanuel Schuetze
|
4ae7f3e243
|
Merge remote branch 'upstream/master' into newtemplate
Conflicts:
openslides/application/views.py
openslides/assignment/templates/assignment/overview.html
openslides/assignment/templates/assignment/view.html
openslides/assignment/views.py
openslides/locale/de/LC_MESSAGES/django.mo
openslides/locale/de/LC_MESSAGES/django.po
openslides/motion/templates/motion/config.html
openslides/motion/templates/motion/edit.html
openslides/motion/templates/motion/import.html
openslides/motion/templates/motion/overview.html
openslides/motion/templates/motion/poll_view.html
openslides/motion/templates/motion/view.html
openslides/participant/templates/participant/base_participant.html
openslides/participant/templates/participant/config.html
openslides/participant/templates/participant/group_edit.html
openslides/participant/templates/participant/group_overview.html
openslides/participant/templates/participant/overview.html
openslides/projector/templates/projector/base_projector.html
openslides/projector/templates/projector/dashboard.html
openslides/projector/templates/projector/live_view_widget.html
openslides/static/styles/base.css
openslides/templates/base.html
openslides/templates/front_page.html
openslides/utils/utils.py
|
2013-01-02 23:01:43 +01:00 |
|
Oskar Hahn
|
6b2645d11c
|
reordered the tests
moved the tests from the openslides-module to an own module
configured coverage
|
2012-11-24 15:00:17 +01:00 |
|
Oskar Hahn
|
bd32994296
|
cleanup
Removed unused imports and fixed pep8 errors
|
2012-11-24 14:01:21 +01:00 |
|
Norman Jäckel
|
af6c403936
|
Fix perms for agenda, motion and assignment widget. It is now set to projector.can_manage_projector.
|
2012-11-21 15:14:38 +01:00 |
|
Emanuel Schuetze
|
e601d8a5a3
|
Fixed display_name of widgets.
|
2012-11-08 09:43:04 +01:00 |
|
Oskar Hahn
|
79c5e93422
|
Redesigned the QuestioMixin
|
2012-10-28 19:59:41 +01:00 |
|
Emanuel Schuetze
|
7fde53a09e
|
Updated template with twitter bootstrap. Step 1: agenda and application.
|
2012-09-05 00:20:28 +02:00 |
|
Oskar Hahn
|
6b7ea558fc
|
rewrote widgets for the dashboard
|
2012-08-15 11:56:43 +02:00 |
|
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 |
|
Oskar Hahn
|
4639e77549
|
apply link redirect to edit-form, if it was a new form
|
2011-09-03 18:35:19 +02:00 |
|
Emanuel Schuetze
|
7c866e11e4
|
Removed ItemPoll and ItemFormPoll.
|
2011-09-03 14:36:01 +02:00 |
|
Oskar Hahn
|
b626d049fe
|
ask, if by deleting an item, if the childen shoud be deleted as well
|
2011-09-03 12:45:19 +02:00 |
|
Oskar Hahn
|
0c931559a0
|
apply button in agenda edit form
|
2011-09-03 12:14:17 +02:00 |
|
Oskar Hahn
|
a9775bdd73
|
api for ajax requests
|
2011-09-02 20:46:24 +02:00 |
|
Oskar Hahn
|
462cba2416
|
close and open a slide with ajax
|
2011-08-31 23:47:31 +02:00 |
|
Oskar Hahn
|
4e03fe90bc
|
active Item by ajax and prepared other ajax features
|
2011-08-31 18:25:03 +02:00 |
|
Oskar Hahn
|
67c6fdba29
|
use a-tag instead of onclick for nojs use
|
2011-08-31 14:17:11 +02:00 |
|
Oskar Hahn
|
3db6a12024
|
Add code
|
2011-07-31 10:46:29 +02:00 |