8cb74c5e7a
Simplified installing of JS and CSS libs. Fixed #1906 .
2016-02-05 23:27:15 +01:00
48d8ca9004
Updated README.
2016-02-05 20:57:21 +01:00
f0b93370d6
Updated README for 2.0b2
2016-01-27 22:59:43 +01:00
552998b067
Update requirements, fixt a lot of warnings
...
Set python 3.4 as minimal supported python version
2016-01-09 12:19:46 +01:00
d583561342
Updated README and CHANGELOG for 2.0b1.
2015-12-07 21:42:20 +01:00
2dacdc8e87
Removed bleach.
2015-10-26 20:58:22 +01:00
f8ed048128
Updated Readme.
2015-06-29 21:53:26 +02:00
4dac4d1ca8
Realy removed mptt
2015-06-28 19:55:48 +02:00
0a24b7267b
Merge branch 'stable/1.6.x'
...
Conflicts:
CHANGELOG
README.rst
openslides/assignment/models.py
openslides/users/forms.py
requirements_production.txt
tests/settings.py
2015-01-17 10:18:29 +01:00
f7cb518430
Used Bower and gulp to manage third party JavaScript and Cascading Style Sheets libraries.
...
Cleaned up settings. Updated development section in README.rst.
Removed jQuery, jquery.cookie and bootstrap from repository.
2015-01-17 00:12:04 +01:00
ec7fa0eea3
Install all portable packages from requirements_production.txt.
2015-01-14 22:14:34 +01:00
808aae597f
Merge branch 'stable/1.6.x' into 'master'.
...
Conflicts:
CHANGELOG
openslides/__init__.py
openslides/assignment/views.py
2014-12-08 22:17:22 +01:00
9a4d357287
Fixed #1354 : Added CKEditor plugin insterpre to README.
2014-10-27 20:17:50 +01:00
32137b6523
Use python3
...
python3.3 and python3.4 are supported
2014-08-24 21:21:11 +02:00
7666be8a29
Update CHANGELOG and README.rst.
2014-05-29 18:19:56 +02:00
2bfa5f3a72
Prepared for release.
...
Small style changes, CHANGELOG and README.rst update.
2014-05-19 22:55:54 +02:00
e9d52245cb
Replace own CKeditor with dedicated app
2014-05-19 00:00:18 +02:00
ee9e2729d1
Updated CHANGELOG, README.rst, requirements files, .travis.yml and setup.py.
2014-05-05 21:25:17 +02:00
5254cc83a6
Updated numbering feature.
...
Fixed organizational item structuring. Prevented organizational items
from having agenda items as descendents. Some coding style changes.
Added CHANGELOG and README entries.
2014-05-04 13:47:01 +02:00
3b3597aa1f
Improved chatbox style. Updated jquery cookie and jquery ui.
...
- Fixed js error on dashboard page if no cookie is found.
- Use cookies only until end of session. For dashboard cookies use url /dashboard only.
- Updated permission numbering of builtin groups and added can_use_chat permission.
- Used minified version of jquery.cookie.
- Added TODO comment for django session way from pull request.
2014-04-27 20:58:22 +02:00
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
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
c13c0997bf
Merge part of stable/1.5.x into master.
...
Conflicts:
openslides/agenda/views.py
openslides/mediafile/forms.py
openslides/projector/api.py
The fix from commit 39de1924cb#1191
2014-04-05 15:19:42 +02:00
9abb7a3caf
Updated CHANGELOG, README.rst, requirements.txt, requirements_production.txt and setup.py.
2014-03-31 21:27:56 +02:00
dc54ef5573
Fixed setup.py, changed readme.
2014-03-31 00:22:03 +02:00
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
ba00f38e32
changed dependency to python 2.6.9
2014-03-12 19:40:22 +01:00
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
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
7f3162f17b
removed duplicated entry from the README.rst
...
See #1189
2014-01-17 16:05:49 +01:00
d8d2ad002a
Rename and clean up static direcories.
...
- rename static subdirs to css and js
- move global static dir to core/static, changed
- move global templates dir to core/templates
- check comments and code style of all our own CSS and JS files
- minor changes related to the changes of template and static files
2014-01-14 23:27:12 +01:00
90f9313faa
Use the jsonfield as requirement
2014-01-11 23:01:29 +01:00
fa84c04492
Added used sphinx extention 'autoimage' to README.
...
Thanks to author Pedro Kroger who has allowed us to use it under MIT.
2013-11-25 20:18:17 +01:00
b00911d1de
Updated README: Removed qrcode. Moved bootstrap.
2013-11-25 19:53:25 +01:00
e2aecc4c4e
Mention django-jsonfield in the README.rst.
2013-11-06 16:53:57 +01:00
0752d476e4
Change to MIT Licence
...
* Remove headers
* Changed lineendings to linux style in AUTHORS and CHANGELOG
2013-11-04 14:57:30 +01:00
bd332bd3d5
added possibility to show pdfs on the projector
2013-10-29 22:05:11 +01:00
47c60078b3
Use sockjs instead of only websocket
2013-10-27 20:50:10 +01:00
37e6bfa008
Change link in install instruction (Setuptools). Fix #949 .
2013-10-22 17:39:20 +02:00
f74cce96cb
Melt INSTALL.txt, THANKS and README.txt to new README.rst. Change metadate for portable version.
2013-10-21 19:46:52 +02:00
Norman Jäckel