Emanuel Schuetze
|
247f6c9431
|
Merge remote branch 'upstream/master' into motiontemplate
Conflicts:
openslides/motion/models.py
openslides/motion/views.py
|
2013-03-14 21:36:02 +01:00 |
|
Emanuel Schuetze
|
a1a11ff53c
|
New motion version diff view. Improved version history table in motion detail template.
|
2013-03-14 21:28:03 +01:00 |
|
Oskar Hahn
|
2944b6ded3
|
fixed travis
|
2013-03-13 00:29:53 +01:00 |
|
Oskar Hahn
|
71b9bd0a08
|
dont set identifier prefix, if it is empty
|
2013-03-12 23:54:37 +01:00 |
|
Oskar Hahn
|
b2c888b151
|
set identifier
|
2013-03-12 23:35:08 +01:00 |
|
Oskar Hahn
|
9cd69f59e0
|
Motion Identifier
|
2013-03-12 22:03:56 +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
|
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
|
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 |
|
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
|
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
|
a08cf84ab8
|
Wrote docstrings to the motion app
|
2013-02-05 18:46:46 +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
|
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
|
1a2f0a1b5a
|
Added links to set and reset the state of a motion
|
2013-02-01 17:20:11 +01:00 |
|
Oskar Hahn
|
fb82a1787b
|
Add workflows for motions
|
2013-02-01 16:33:45 +01:00 |
|
Oskar Hahn
|
3f02a28002
|
Added a poll delete view to the new motion app
|
2013-02-01 13:24:44 +01:00 |
|
Oskar Hahn
|
da7a7a9d68
|
Add Poll-system to the new motion app
|
2013-02-01 12:51:54 +01:00 |
|
Oskar Hahn
|
d911e311d6
|
Let the user support and unsupport the motion
|
2013-01-26 18:18:02 +01:00 |
|
Oskar Hahn
|
87e42cf9f8
|
Let the user choose if the motion should have a new version
via config or form
|
2013-01-26 17:09:13 +01:00 |
|
Oskar Hahn
|
0702d49e2e
|
Save the supporter
|
2013-01-26 16:42:23 +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
|
8708ba5da6
|
Only save new version, when version-data has changed
|
2013-01-26 15:39:35 +01:00 |
|
Oskar Hahn
|
1f87749742
|
Save the submitters to the motion
|
2013-01-26 15:25:54 +01:00 |
|
Oskar Hahn
|
1ae140c11e
|
Add docstrings to the motion class
|
2013-01-26 12:28:51 +01:00 |
|
Emanuel Schuetze
|
b8532fabe4
|
Removed files from images to img dir.
|
2013-01-18 22:23:31 +01:00 |
|
Oskar Hahn
|
0231fe37f5
|
Start to rewrite the motion app
|
2013-01-08 20:22:03 +01:00 |
|
Emanuel Schuetze
|
13cd52bd96
|
Merged (conflicts).
|
2013-01-05 15:29:57 +01:00 |
|
Emanuel Schuetze
|
d671740966
|
Fixed merged errors.
|
2013-01-02 23:22:12 +01:00 |
|
Oskar Hahn
|
366b8e0f1f
|
Droped support for python 2.5
|
2012-12-14 14:21:53 +01:00 |
|
Oskar Hahn
|
bd32994296
|
cleanup
Removed unused imports and fixed pep8 errors
|
2012-11-24 14:01:21 +01:00 |
|