Oskar Hahn
|
3832aa4178
|
Tests for the motion views
|
2013-03-15 12:18:27 +01:00 |
|
Oskar Hahn
|
c46ec570bf
|
Merge branch 'master' of github.com:OpenSlides/OpenSlides
|
2013-03-15 02:16:26 +01:00 |
|
Oskar Hahn
|
81eb92a761
|
fixed pep8
|
2013-03-15 02:14:15 +01:00 |
|
Oskar Hahn
|
1a2ebf7b3b
|
removed some unused functions
|
2013-03-15 01:34:17 +01:00 |
|
Emanuel Schuetze
|
d180b4f331
|
Reverted support/unsupport changes (question)
|
2013-03-14 23:45:17 +01:00 |
|
Emanuel Schuetze
|
20118ae833
|
Improved version.get command
|
2013-03-14 23:35:57 +01:00 |
|
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 |
|
Emanuel Schuetze
|
b2dc3820bd
|
Changed motion.number to motion.identifier.
|
2013-03-14 23:04:32 +01:00 |
|
Emanuel Schuetze
|
88a32dc546
|
Updated motion version warnings (not latest/authorized version)
|
2013-03-14 22:56:25 +01:00 |
|
Emanuel Schuetze
|
73430e45d8
|
Changed style for empty category table.
|
2013-03-14 22:54:33 +01:00 |
|
Emanuel Schuetze
|
fa098f6bd3
|
Typo.
|
2013-03-14 22:54:00 +01:00 |
|
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
|
304887e8f3
|
Changed comlex workflow automaticly set the identifier
|
2013-03-12 22:13:17 +01:00 |
|
Oskar Hahn
|
d21185a449
|
Merge branch 'master' of github.com:OpenSlides/OpenSlides into category
|
2013-03-12 22:05:20 +01:00 |
|
Oskar Hahn
|
9cd69f59e0
|
Motion Identifier
|
2013-03-12 22:03:56 +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 |
|
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 |
|
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 |
|