Emanuel Schuetze
|
2a2c704bf2
|
GetVersionMixin not required. Fixed htmldiff function.
|
2013-03-14 23:26:41 +01:00 |
|
Emanuel Schuetze
|
3f4df58807
|
Moved htmldiff function to utils.py. Fixed travis build error (pep8).
|
2013-03-14 23:22:11 +01:00 |
|
Oskar Hahn
|
d21185a449
|
Merge branch 'master' of github.com:OpenSlides/OpenSlides into category
|
2013-03-12 22:05:20 +01:00 |
|
Norman Jäckel
|
03fff46517
|
Add new TestCase class in utils to call the signal on running every test.
|
2013-03-12 21:38:22 +01:00 |
|
Oskar Hahn
|
31ba70efd1
|
Category Delete View
|
2013-03-11 21:38:07 +01:00 |
|
Norman Jäckel
|
514577f7c6
|
Built-in Workflows are created by listening to a signal which is sent after syncdb.
|
2013-03-11 21:32:09 +01:00 |
|
Oskar Hahn
|
51a9e41015
|
Set new django setting. Put tornado code in a seperate file.
|
2013-02-27 18:54:06 +01:00 |
|
Oskar Hahn
|
2822c39f8a
|
Merge branch 'master' into tornado
|
2013-02-18 19:08:58 +01:00 |
|
Norman Jäckel
|
f2dde228c9
|
Work on motion workflow system.
Also: Insert new base exception for OpenSlides.
Also: Insert a workflow field to the state class. Update tests. Rename versioning attribute.
|
2013-02-13 23:04:24 +01:00 |
|
Oskar Hahn
|
27c73092e1
|
Merge remote-tracking branch 'emanuel/newtemplate' into new_motion
Conflicts:
openslides/motion/templates/motion/overview.html
openslides/motion/templates/motion/poll_view.html
openslides/motion/templates/motion/view.html
|
2013-02-06 09:25:27 +01:00 |
|
Emanuel Schuetze
|
82e35bebff
|
Fixed wrong deletion if user clicks "no" in confirm form.
|
2013-02-05 21:31:45 +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
|
e7c65b3db1
|
Moved some methodes from utils.views.DeleteView to QuestionMixin
|
2013-02-03 13:23:55 +01:00 |
|
Oskar Hahn
|
15b13c2bcd
|
Handel null=True in PersonField
|
2013-02-02 21:19:37 +01:00 |
|
Oskar Hahn
|
2e430b4406
|
check permission in motion view
|
2013-02-02 10:59:07 +01:00 |
|
Oskar Hahn
|
3ffb16d4d8
|
Fixed pep8 errors
|
2013-02-02 10:52:13 +01:00 |
|
Oskar Hahn
|
6c3eb0f765
|
fixed urls in views from the participant app
|
2013-02-01 17:35:27 +01:00 |
|
Oskar Hahn
|
1a2f0a1b5a
|
Added links to set and reset the state of a motion
|
2013-02-01 17:20:11 +01:00 |
|
Oskar Hahn
|
b6256b73e0
|
Changed utils.views.DeleteView
|
2013-02-01 13:24:30 +01:00 |
|
Oskar Hahn
|
adeaf248ef
|
Changed utils.- and poll.views
|
2013-02-01 12:51:01 +01:00 |
|
Oskar Hahn
|
d3b340769b
|
Added motion config tab
|
2013-01-26 16:33:55 +01:00 |
|
Oskar Hahn
|
ecb6419f8c
|
fixed apply and success url in utils.views
|
2013-01-26 16:19:53 +01:00 |
|
Oskar Hahn
|
1f87749742
|
Save the submitters to the motion
|
2013-01-26 15:25:54 +01:00 |
|
Roland Geider
|
3bfead298d
|
Add custom management command to start the application with tornado
|
2013-01-23 21:12:36 +01:00 |
|
Emanuel Schuetze
|
586425354d
|
Reworked new template, especially agenda and dashboard.
|
2013-01-08 23:05:35 +01:00 |
|
Oskar Hahn
|
0231fe37f5
|
Start to rewrite the motion app
|
2013-01-08 20:22:03 +01:00 |
|
Norman Jäckel
|
deb0d5b2e5
|
Some fixes. Update requirements.txt and setup.py.
|
2013-01-05 23:20:38 +01:00 |
|
Emanuel Schuetze
|
13cd52bd96
|
Merged (conflicts).
|
2013-01-05 15:29:57 +01:00 |
|
Oskar Hahn
|
6417f5f107
|
fixed pep8 error
|
2013-01-05 14:56:22 +01:00 |
|
Oskar Hahn
|
2fcf0b3a07
|
fixed typo in utils/views.py
|
2013-01-05 14:46:05 +01:00 |
|
Oskar Hahn
|
ae8641bcad
|
Raise an error if an CreateView does not define a apply_url
|
2013-01-05 01:48:03 +01:00 |
|
Oskar Hahn
|
2f28655a25
|
Show Tabs if there do not define some permissions
|
2013-01-05 01:03:42 +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
|
b79fedc215
|
fixed jsonfield for django 1.5
|
2012-12-14 15:36:57 +01:00 |
|
Oskar Hahn
|
366b8e0f1f
|
Droped support for python 2.5
|
2012-12-14 14:21:53 +01:00 |
|
Norman Jäckel
|
589c209c79
|
Merge branch 'master' into Version_String
Conflicts:
openslides/__init__.py
openslides/config/views.py
|
2012-11-28 17:54:29 +01:00 |
|
Oskar Hahn
|
e7c47395bb
|
Gave the empty user all the attributes it needs
|
2012-11-27 22:46:54 +01:00 |
|
Oskar Hahn
|
4dfd4ac67f
|
fix _proper_unicode
|
2012-11-26 15:48:23 +01:00 |
|
Oskar Hahn
|
bdfb714013
|
fixed pep8 in pdf.py
|
2012-11-26 10:35:29 +01:00 |
|
Oskar Hahn
|
b3806d8cdd
|
some tests for the agenda
|
2012-11-24 21:10:55 +01:00 |
|
Oskar Hahn
|
bd32994296
|
cleanup
Removed unused imports and fixed pep8 errors
|
2012-11-24 14:01:21 +01:00 |
|
Oskar Hahn
|
f5a438cf9f
|
cleanup in utils
|
2012-11-24 01:42:10 +01:00 |
|
Norman Jäckel
|
4c97291598
|
Remove non-used revision template var.
|
2012-11-23 11:33:34 +01:00 |
|
Oskar Hahn
|
1dc7d45670
|
sort persons in motions
|
2012-11-22 17:00:09 +01:00 |
|
Oskar Hahn
|
8014f327a2
|
Merge branch 'master' of github.com:OpenSlides/OpenSlides into sort_person_api
|
2012-11-22 16:35:26 +01:00 |
|
Oskar Hahn
|
fbf81e7780
|
sort persons
|
2012-11-22 16:19:09 +01:00 |
|
Emanuel Schuetze
|
27fa32b718
|
Removed frontpage and redirect '/' to dashboard url (because there is already a new welcome widget with the content of the frontpage on dashboard)
|
2012-11-17 22:14:49 +01:00 |
|
Emanuel Schuetze
|
e338529865
|
#296: Localised the datetime in PDF header
|
2012-11-17 21:44:17 +01:00 |
|
Emanuel Schuetze
|
5623bb6888
|
Move professional support message into base template footer.
|
2012-11-08 19:13:31 +01:00 |
|
Oskar Hahn
|
79c5e93422
|
Redesigned the QuestioMixin
|
2012-10-28 19:59:41 +01:00 |
|