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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
Oskar Hahn
|
f588cd58a3
|
Merge pull request #541 from normanjaeckel/master
Small fix in the motion app in the PDFs.
|
2013-02-19 15:24:21 -08:00 |
|
Norman Jäckel
|
03d57d17b0
|
Fix state attributes in motion pdf.
|
2013-02-19 23:43:20 +01:00 |
|
Oskar Hahn
|
60bbf86d81
|
Merge pull request #537 from normanjaeckel/Recover_Commit
Recover commit 6a639fe498
|
2013-02-18 14:16:38 -08: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
|
c54a7d06f6
|
Merge pull request #536 from ostcar/tornado
Tornado
|
2013-02-18 11:00:23 -08: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
|
07e9f4a82d
|
Merge pull request #535 from ostcar/ticket_433
Ticket 433
|
2013-02-18 09:59:48 -08: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
|
a591e4f547
|
Fixed tests
|
2013-02-18 18:44:46 +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 |
|
Stefan Frauenknecht
|
8a8a1de7ba
|
.idea folder deleted
|
2013-02-18 12:20:00 +01:00 |
|