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 |
|
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 |
|
Norman Jäckel
|
9679be1867
|
Move builtin groups to a signal.
|
2013-03-12 20:58:22 +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 |
|
Emanuel Schuetze
|
71b1bede6f
|
Set new button als primary/blue button.
|
2013-03-09 14:17:30 +01:00 |
|
Emanuel Schuetze
|
c3c200b423
|
Changed link to new csv import wiki page on github.
|
2013-03-09 14:16:28 +01:00 |
|
Emanuel Schuetze
|
48e1282cb9
|
Show duration clock only if start/end time is set.
|
2013-03-09 14:15:03 +01:00 |
|
Emanuel Schuetze
|
56a510e89c
|
Removed link to professional support in base template (footer).
|
2013-03-08 08:31:52 +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
|
757b97e4cb
|
Merge pull request #542 from frauenknecht/master
Issue #539 Default config value in agenda app
|
2013-02-22 03:54:30 -08:00 |
|
Stefan Frauenknecht
|
45856fc9b0
|
add signal callback to provide defaults
|
2013-02-20 23:50:34 +01:00 |
|
Stefan Frauenknecht
|
f81abe215f
|
Revert last changes
|
2013-02-20 23:48:04 +01:00 |
|
Stefan Frauenknecht
|
343aa018e4
|
Fixed Issue #539 - Default config value in agenda app
|
2013-02-20 22:09: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
|
853dcf8334
|
fixed pep8
|
2013-02-18 20:06:46 +01:00 |
|
Oskar Hahn
|
f388f3d41a
|
handle static files with tornado
|
2013-02-18 19:58:18 +01:00 |
|
Oskar Hahn
|
2822c39f8a
|
Merge branch 'master' into tornado
|
2013-02-18 19:08:58 +01:00 |
|
Oskar Hahn
|
ce1e1c112f
|
fixed pep8
|
2013-02-18 18:59:24 +01:00 |
|
Oskar Hahn
|
4f3f917812
|
some small code design changes
|
2013-02-18 18:56:37 +01:00 |
|
Oskar Hahn
|
cb5b735565
|
Merge branch 'master' into HEAD
|
2013-02-18 18:34:52 +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 |
|
Stefan Frauenknecht
|
1d1d72d45a
|
Fixed if condition with duration property which can be None
|
2013-02-16 11:55:40 +01:00 |
|
Stefan Frauenknecht
|
8103c09b81
|
PEP8 errors resolved
|
2013-02-16 10:41:22 +01:00 |
|
Emanuel Schuetze
|
0b3b91b8d5
|
Show item-tooltip in bootstrap tooltip style.
|
2013-02-15 08:51:08 +01:00 |
|
Emanuel Schuetze
|
4f60160667
|
Added missing success_url_name.
|
2013-02-15 08:50:42 +01:00 |
|
Emanuel Schuetze
|
e9c996340a
|
Used custom build jquery-ui javascript components file. Integrated required jquery-ui styles (no remote link). Added used jquery components/addons to THANKS file.
|
2013-02-15 08:39:36 +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 |
|
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 |
|
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
|
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
|
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
|
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 |
|
Oskar Hahn
|
1518543a9a
|
Added motion widget and deletion of motions
|
2013-02-02 00:27:16 +01:00 |
|
Oskar Hahn
|
0f7d0e349c
|
Fixed URLs in projector views
|
2013-02-02 00:26:08 +01:00 |
|
Oskar Hahn
|
bd317aed31
|
Wrote tests for openslides.motion.models.Motion
|
2013-02-01 19:19:18 +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
|
ac41a02ac5
|
Block supporting, unsupporting and creation of poll in some states
|
2013-02-01 16:44:06 +01:00 |
|
Oskar Hahn
|
fb82a1787b
|
Add workflows for motions
|
2013-02-01 16:33:45 +01:00 |
|
Stefan Frauenknecht
|
7f03e02e9a
|
Item type changed from CharField to IntegerField. Constant type names added.
|
2013-02-01 15:13:40 +01:00 |
|
Stefan Frauenknecht
|
9f3dae8059
|
ConfigForm: Base classes reordered
|
2013-02-01 14:47:51 +01:00 |
|
Stefan Frauenknecht
|
c595701597
|
Agenda orga items and time scheduling: Formatting improved. Use permission 'can_see_orga_items' also to show/hide duration column and agenda time scheduling. (via Emanuel)
|
2013-02-01 14:41:52 +01:00 |
|
Oskar Hahn
|
3f02a28002
|
Added a poll delete view to the new motion app
|
2013-02-01 13:24:44 +01:00 |
|