Emanuel Schuetze
4e6818fb1a
Compressed jquery-ui files (for agenda config).
2013-03-18 20:22:54 +01:00
Emanuel Schuetze
b3fca8f6f2
Updated bootstrap from 2.2.2 to 2.3.1
2013-03-18 20:19:17 +01:00
Oskar Hahn
246c7a456a
Merge pull request #569 from ostcar/motion_tests
...
Motion tests
2013-03-15 04:39:28 -07:00
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
2134b0985f
Merge pull request #568 from ostcar/motion_template
...
Motion template
2013-03-14 18:15:54 -07: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
49765bbe6e
Merge remote branch 'upstream/master' into motiontemplate
2013-03-14 23:05:38 +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
Oskar Hahn
43cd5aba00
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2013-03-14 22:44:11 +01:00
Oskar Hahn
63932a348e
Merge pull request #561 from emanuelschuetze/datatables-participants
...
Datatables for participants table (reworked)
2013-03-14 14:40:01 -07:00
Emanuel Schuetze
0587c2019a
Integrated DataTables function for participants table (for client side sorting/filtering/pagination). Removed old server side sorting/filtering code.
...
Fixed csv import (added success url).
Added large csv file for testing import of >1000 participants.
Removed lage csv example file for paticipants (will be sustitute by a test script in future).
2013-03-14 22:34:40 +01:00
Oskar Hahn
545d4be04f
fixed update of person_api
2013-03-14 22:32: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
0065452d29
Merge pull request #564 from ostcar/category
...
fixed travis
2013-03-12 16:51:55 -07:00
Oskar Hahn
2944b6ded3
fixed travis
2013-03-13 00:29:53 +01:00
Oskar Hahn
2a33210276
Merge pull request #563 from ostcar/category
...
Category
2013-03-12 15:56:18 -07: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
Oskar Hahn
80b7597022
Merge pull request #562 from normanjaeckel/Listen_To_Syncdb
...
Builtin Workflows and Groups are now created by listening to a signal
2013-03-12 14:00:35 -07:00
Norman Jäckel
edce8c59f1
Fix PEP8, and forgotten import change. Update .travis.
2013-03-12 21:56:13 +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
Oskar Hahn
73723feb74
Merge pull request #557 from ostcar/motion_template
...
Motion template
2013-03-11 10:38:44 -07: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
