Norman Jäckel
|
2e37e4c18b
|
Comment the dev-file workflow.py
|
2013-02-14 11:16:46 +01:00 |
|
Norman Jäckel
|
6223b3199d
|
Merge branch 'OpenSlidesError' into workflow_2
Conflicts:
openslides/utils/exceptions.py
|
2013-02-13 23:05:50 +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 |
|
Emanuel Schuetze
|
e3428d3e83
|
Some style work.
|
2013-02-11 23:01:48 +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 |
|
Emanuel Schuetze
|
a51a296434
|
Changed agenda start/end time to djangos DATETIME_FORMAT.
|
2013-02-09 22:59:15 +01:00 |
|
Norman Jäckel
|
b1f1eee13f
|
Insert new base exception for OpenSlides.
|
2013-02-09 22:02:17 +01:00 |
|
Oskar Hahn
|
e0a68c4fe0
|
Merge branch 'new_motion'
|
2013-02-06 11:12:24 +01:00 |
|
Oskar Hahn
|
6a639fe498
|
Add todos
|
2013-02-06 11:11:49 +01:00 |
|
Oskar Hahn
|
44ea7c835d
|
Merge pull request #90 from ostcar/new_motion
New motion and new template
|
2013-02-06 00:38:30 -08:00 |
|
Oskar Hahn
|
5573077b88
|
fixed pep8
|
2013-02-06 09:34:44 +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
|
ce51f0ef7e
|
template: minor style changes
|
2013-02-05 23:42:30 +01:00 |
|
Emanuel Schuetze
|
6b4ee0e4f6
|
Updated translation.
|
2013-02-05 23:09:23 +01:00 |
|
Emanuel Schuetze
|
c8ddb21760
|
Fixed wrong hiding of open agenda child items if parent item is closed
|
2013-02-05 22:36:05 +01:00 |
|
Emanuel Schuetze
|
e49efb40d8
|
template: Added new css class for minimum column width.
|
2013-02-05 22:03:43 +01:00 |
|
Emanuel Schuetze
|
bfd01e67b6
|
template: Removed unused 'cycle' template tag.
|
2013-02-05 21:55:41 +01:00 |
|
Emanuel Schuetze
|
d809ff95bb
|
template: Removed unused participant.css
|
2013-02-05 21:51:09 +01:00 |
|
Emanuel Schuetze
|
2d009d7c38
|
Updated THANKS file: Added Twitter Bootstrap. Removed Oxygen Icons.
|
2013-02-05 21:47:11 +01:00 |
|
Emanuel Schuetze
|
64e3c1f3cb
|
template: Removed unused 'load staticfiles'.
|
2013-02-05 21:41:26 +01:00 |
|
Emanuel Schuetze
|
8388774f12
|
template: Minor style changes.
|
2013-02-05 21:33:07 +01:00 |
|
Emanuel Schuetze
|
82e35bebff
|
Fixed wrong deletion if user clicks "no" in confirm form.
|
2013-02-05 21:31:45 +01:00 |
|
Emanuel Schuetze
|
0c5459f96e
|
template: Removed old icons. Added some new glyphicons. Updated template style. Some fixes.
|
2013-02-05 20:40:55 +01:00 |
|
Oskar Hahn
|
042f1a8571
|
Fixed typo
|
2013-02-05 18:49:32 +01:00 |
|
Oskar Hahn
|
a08cf84ab8
|
Wrote docstrings to the motion app
|
2013-02-05 18:46:46 +01:00 |
|
Emanuel Schuetze
|
8f05ada6a1
|
template style and new icons
|
2013-02-05 17:05:40 +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 |
|
Emanuel Schuetze
|
80b0ab5252
|
template: Updated dashboard. Fixed ajax functionality. Adapted style.
|
2013-02-05 11:24:41 +01:00 |
|
Emanuel Schuetze
|
6db0210ef3
|
Updated jquery form plugin to v3.26.0-2013.01.28
|
2013-02-05 11:22:01 +01:00 |
|
Emanuel Schuetze
|
5e44bba941
|
Updated jquery from 1.9.0 to 1.9.1.
|
2013-02-05 11:15:23 +01:00 |
|
Emanuel Schuetze
|
404bf7f0b5
|
template: Added missing back link.
|
2013-02-04 13:38:29 +01:00 |
|
Emanuel Schuetze
|
36f5c97dbe
|
Added assignment context menu (more actions). Fixed 'back to election' link.
|
2013-02-04 13:18:10 +01:00 |
|
Emanuel Schuetze
|
e822efdc81
|
Some template style work.
|
2013-02-04 13:06:36 +01:00 |
|
Oskar Hahn
|
a34731c00e
|
fixed pep8 in motion.pdf
|
2013-02-03 20:12:44 +01:00 |
|
Oskar Hahn
|
342404518b
|
fixed travis
|
2013-02-03 20:06:00 +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
|
b8a353fa7c
|
Added PDF view for the motions
|
2013-02-03 18:18:29 +01:00 |
|
Oskar Hahn
|
42082ae3c2
|
fixed pep8
|
2013-02-03 14:14:07 +01:00 |
|
Oskar Hahn
|
cbd4acbd4b
|
fixed motion tests
|
2013-02-03 13:55:42 +01:00 |
|
Oskar Hahn
|
ef7f6cf476
|
Permission system for MotionVersions
|
2013-02-03 13:24:29 +01:00 |
|
Oskar Hahn
|
e7c65b3db1
|
Moved some methodes from utils.views.DeleteView to QuestionMixin
|
2013-02-03 13:23:55 +01:00 |
|
Oskar Hahn
|
f4ea611fb8
|
Wrote log messages for motion changes
|
2013-02-03 10:02:06 +01:00 |
|
Oskar Hahn
|
65a18953bd
|
Added translatable log to the new motion system
|
2013-02-02 21:40:23 +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
|
4cc6539f0c
|
Added get_allowed_actions to new motion app
|
2013-02-02 10:24:28 +01:00 |
|
Oskar Hahn
|
a27bd7eade
|
Add motion to agenda
|
2013-02-02 00:51:08 +01:00 |
|
Oskar Hahn
|
910e0f17e7
|
Add slide Date to the motion
|
2013-02-02 00:37:43 +01:00 |