Commit Graph

95 Commits

Author SHA1 Message Date
Emanuel Schuetze
a1a11ff53c New motion version diff view. Improved version history table in motion detail template. 2013-03-14 21:28:03 +01:00
Emanuel Schuetze
196ad217b0 Fixed version history. 2013-03-11 23:58:45 +01:00
Emanuel Schuetze
d41ce146e2 Added category_delete function to template. 2013-03-11 21:50:16 +01:00
Emanuel Schütze
db97d3c312 Merge pull request #2 from ostcar/category
Category Delete View
2013-03-11 13:45:54 -07:00
Oskar Hahn
31ba70efd1 Category Delete View 2013-03-11 21:38:07 +01:00
Emanuel Schuetze
d9fbaf9aa7 Updated motion category template. 2013-03-11 21:29:56 +01:00
Emanuel Schütze
ff848a865a Merge pull request #1 from ostcar/category
Category
2013-03-11 12:46:42 -07:00
Oskar Hahn
f411040c3a Append missing files 2013-03-11 20:43:23 +01:00
Oskar Hahn
bc7be27131 Add CategoryFormField to the MotionForm 2013-03-11 20:41:02 +01:00
Oskar Hahn
2614a1cb2f Categories for Motions 2013-03-11 20:17:19 +01:00
Emanuel Schuetze
1b93cec209 Merge remote branch 'upstream/master'
Conflicts:
	openslides/motion/models.py
2013-03-11 19:16:16 +01:00
Emanuel Schuetze
42c847dfba Update motion templates to new template design. Added some missing model and view functions. 2013-03-11 18:26:22 +01:00
Emanuel Schuetze
5c70b4a044 Update after comments: Removed user context var. Removed condition in unupport state check. 2013-03-11 16:56:56 +01:00
Emanuel Schuetze
ee0e599a6c Update motion templates to new template design. Added some missing model and view functions. 2013-03-09 14:29:40 +01:00
Norman Jäckel
03d57d17b0 Fix state attributes in motion pdf. 2013-02-19 23:43:20 +01:00
Norman Jäckel
6b71142747 Recover commit 6a639fe498 2013-02-18 22:08:21 +01:00
Oskar Hahn
ce1e1c112f fixed pep8 2013-02-18 18:59:24 +01:00
Oskar Hahn
051723e686 Merge branch 'master' of github.com:OpenSlides/OpenSlides
Conflicts:
	openslides/motion/models.py
	openslides/motion/workflow.py
2013-02-18 18:31:35 +01:00
Norman Jäckel
2603d93d69 Fix PEP8 and tests. 2013-02-17 17:07:44 +01:00
Norman Jäckel
8363b06fc1 Move motion exceptions to its own file in the motion app. 2013-02-14 19:27:36 +01:00
Norman Jäckel
2e37e4c18b Comment the dev-file workflow.py 2013-02-14 11:16:46 +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
6a639fe498 Add todos 2013-02-06 11:11:49 +01: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
e49efb40d8 template: Added new css class for minimum column width. 2013-02-05 22:03:43 +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
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
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
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
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
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
Oskar Hahn
1518543a9a Added motion widget and deletion of motions 2013-02-02 00:27:16 +01:00
Oskar Hahn
bd317aed31 Wrote tests for openslides.motion.models.Motion 2013-02-01 19:19:18 +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
ac41a02ac5 Block supporting, unsupporting and creation of poll in some states 2013-02-01 16:44:06 +01:00