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
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
Oskar Hahn
479cdf5334
Merge pull request #554 from emanuelschuetze/master
...
Removed link to professional support in base template
2013-03-08 00:19:27 -08:00
Emanuel Schuetze
56a510e89c
Removed link to professional support in base template (footer).
2013-03-08 08:31:52 +01:00
Oskar Hahn
6552d981b9
Merge pull request #550 from ostcar/master
...
Use Pillow instead of PIL
2013-02-28 02:46:38 -08:00
Oskar Hahn
7fb3c38cc8
Use Pillow instead of PIL
2013-02-28 11:29:17 +01:00
Oskar Hahn
f066e24e80
Merge pull request #549 from normanjaeckel/Update_Requirements
...
Update dev packages in requirements.
2013-02-27 16:22:01 -08:00
Norman Jäckel
ed515f5e76
Update dev packages in requirements.
2013-02-28 00:37:02 +01:00
Oskar Hahn
2182008234
Merge pull request #548 from ostcar/master
...
Tornado
2013-02-27 09:57:30 -08: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
36987e21cb
Merge pull request #547 from ostcar/master
...
Django 1.5 is finaly released
2013-02-27 03:30:44 -08:00
Oskar Hahn
14f062f59f
Django 1.5 release
2013-02-27 12:27:54 +01:00
Oskar Hahn
91fe54dbd6
Merge pull request #545 from emanuelschuetze/master
...
CSV example files for motion and participants import
2013-02-26 01:13:06 -08:00
Emanuel Schuetze
ad08efb3b6
Added csv example files for motion and participants import from old
...
trac wiki.
2013-02-26 10:09:09 +01:00
