Commit Graph

75 Commits

Author SHA1 Message Date
Norman Jäckel 137e855e77 Updated requirements_production.txt. 2014-05-15 20:28:17 +02:00
Norman Jäckel e6dc63578c Update natsort dependency.
Drop natsort 3.1.2 because the package seems broken.
2014-05-12 22:29:59 +02:00
Norman Jäckel ee9e2729d1 Updated CHANGELOG, README.rst, requirements files, .travis.yml and setup.py. 2014-05-05 21:25:17 +02:00
Stefan Frauenknecht 2c5b3a8e4f Automatic numbering of agenda items 2014-05-04 13:47:01 +02:00
Emanuel Schütze 87cd81f1ff Updated packages in requirements_production.txt and prepare_portable.py
Added new license files of packages for portable version.
2014-04-28 21:30:39 +02:00
Norman Jäckel e6dad6d087 Merge part of stable/1.5.x into master.
Conflicts:
	CHANGELOG
	extras/win32-portable/create_portable.txt
	extras/win32-portable/prepare_portable.py
	openslides/__init__.py
	openslides/core/templates/base.html
	requirements_production.txt
	tests/config/test_config.py
2014-04-08 20:33:07 +02:00
Emanuel Schütze 3d7ecab8e4 Merge commit '7addd69050a69b9d02aacba116939829497ca338' into MergeStablePart2
Conflicts:
	extras/win32-portable/create_portable.txt
	extras/win32-portable/prepare_portable.py
	openslides/assignment/views.py
	openslides/core/static/img/circle.png
	openslides/motion/pdf.py
	openslides/utils/pdf.py
2014-04-07 22:35:52 +02:00
Norman Jäckel 9abb7a3caf Updated CHANGELOG, README.rst, requirements.txt, requirements_production.txt and setup.py. 2014-03-31 21:27:56 +02:00
Emanuel Schütze b5fb83c026 Fixed #551: Used unicode font for circle in ballot pdf. Removed pillow.
That fixed also #1140 (Server error when trying to view ballot paper pdf)
2014-03-29 13:20:31 +01:00
Oskar Hahn a6fa8457cc Merge remote-tracking branch 'openslides/stable/1.5.x'
Conflicts:
	extras/win32-portable/create_portable.txt
	extras/win32-portable/prepare_portable.py
	openslides/motion/templates/motion/motion_list.html
	openslides/projector/templates/projector.html
	requirements_production.txt
2014-03-12 19:29:22 +01:00
Oskar Hahn 6ae503e009 fix for python2.6 and pip 1.5 2014-03-11 23:50:30 +01:00
Emanuel Schuetze 13eb0ccb30 Fixed #1190: Wrong sorting of motion identifier
- Added natural sorting JS plugin for motion DataTables (column identifier).
- Added the new requirements python package 'natsort' for natural sorting of motions in PDF.
2014-01-21 23:14:39 +01:00
Norman Jäckel 04b0cfb0bc Used entry points to detect plugins automaticly. 2014-01-12 12:48:24 +01:00
Oskar Hahn 90f9313faa Use the jsonfield as requirement 2014-01-11 23:01:29 +01:00
Oskar Hahn 9f0395c758 Changed requirements to flexible versions in setup.py 2013-11-21 20:13:24 +01:00
Norman Jäckel 09e315beb7 Sort requirements, fix #1031. 2013-11-14 22:38:12 +01:00
Oskar Hahn ab048e3393 Update to Django 1.6 2013-11-07 18:56:06 +01:00
Oskar Hahn 47c60078b3 Use sockjs instead of only websocket 2013-10-27 20:50:10 +01:00
Emanuel Schuetze f1a8993452 Used reportlabs qrcode widget (instead of extra qrcode package). 2013-10-21 21:27:07 +02:00
Emanuel Schuetze 66d9d22e27 Updated requirements. 2013-10-21 21:27:07 +02:00
Emanuel Schuetze e277b8babf Full text search with haystack and whoosh.
Updated THANKS file.
Portable: Added haystack and whoosh.
2013-10-16 08:58:35 +02:00
Emanuel Schuetze b1d5faac13 Fixed #853: Updated django from 1.5.1 to 1.5.2. 2013-09-06 21:59:52 +02:00
Norman Jäckel 51cad826cf Update requirements 2013-06-03 19:30:04 +02:00
Norman Jäckel 4cbd717a13 Update requirements: bleach version 1.2.2 2013-05-23 23:41:27 +02:00
Norman Jäckel 1a58298daf Update metafiles for new packaging style 2013-05-16 23:54:49 +02:00