ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2789 from normanjaeckel/Metadata

Browse Source 
Updated deps.
This commit is contained in:
Norman Jäckel 2016-12-16 22:42:42 +01:00 committed by GitHub
commit f74cba98e1
3 changed files with 59 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
README.rst
View File

@ -132,9 +132,9 @@ The configuration values that have to be altered are:
Please see: Please see:
* http://channels.readthedocs.io/en/latest/deploying.html * http://channels.readthedocs.io/en/latest/deploying.html
* https://docs.djangoproject.com/en/1.9/topics/cache/ * https://docs.djangoproject.com/en/1.10/topics/cache/
* https://github.com/sebleier/django-redis-cache * https://github.com/sebleier/django-redis-cache
* https://docs.djangoproject.com/en/1.9/ref/settings/#databases * https://docs.djangoproject.com/en/1.10/ref/settings/#databases
You should use a webserver like Apache HTTP Server or nginx to serve the static You should use a webserver like Apache HTTP Server or nginx to serve the static
and media files as proxy server in front of OpenSlides server. You also and media files as proxy server in front of OpenSlides server. You also
@ -147,30 +147,43 @@ Used software
OpenSlides uses the following projects or parts of them: OpenSlides uses the following projects or parts of them:
* `backports-abc <https://github.com/cython/backports_abc>`_, * `asgiref <https://github.com/django/asgiref/>`_, License: BSD
License: Python Software Foundation License
* `Autobahn <http://autobahn.ws/python/>`_, License: MIT
* `Constantly <https://github.com/twisted/constantly>`_, License: MIT
* `daphne <https://github.com/django/daphne/>`_, License: BSD
* `Django <https://www.djangoproject.com>`_, License: BSD * `Django <https://www.djangoproject.com>`_, License: BSD
* `Django Channels <https://github.com/django/channels>`_, License: BSD
* `django-jsonfield <https://github.com/bradjasper/django-jsonfield>`_,
License: MIT
* `Django REST framework <http://www.django-rest-framework.org>`_, License: * `Django REST framework <http://www.django-rest-framework.org>`_, License:
BSD BSD
* `Django Channels <https://github.com/andrewgodwin/channels/>`_, License: MIT * `Incremental <https://github.com/hawkowl/incremental>`_, License: MIT
* `django-jsonfield <https://github.com/bradjasper/django-jsonfield/>`_,
License: MIT
* `PyPDF2 <http://mstamy2.github.io/PyPDF2/>`_, License: BSD * `PyPDF2 <http://mstamy2.github.io/PyPDF2/>`_, License: BSD
* `roman <https://pypi.python.org/pypi/roman>`_, License: Python 2.1.1 * `roman <https://pypi.python.org/pypi/roman>`_, License: Python 2.1.1
* `setuptools <https://pypi.python.org/pypi/setuptools>`_, * `setuptools <https://pypi.python.org/pypi/setuptools>`_, License: MIT
License: Python Software Foundation License
* `Six <http://pythonhosted.org/six/>`_, License: MIT * `Six <http://pythonhosted.org/six/>`_, License: MIT
* `Twisted <https://twistedmatrix.com>`_, License: MIT
* `txaio <https://github.com/crossbario/txaio>`_, License: MIT
* `Whoosh <https://bitbucket.org/mchaput/whoosh/wiki/Home>`_, License: BSD * `Whoosh <https://bitbucket.org/mchaput/whoosh/wiki/Home>`_, License: BSD
* `zope.interface <https://github.com/zopefoundation/zope.interface>`,
License: ZPL 2.1
* Several JavaScript packages (see ``bower.json``) * Several JavaScript packages (see ``bower.json``)
* `angular <http://angularjs.org>`_, License: MIT * `angular <http://angularjs.org>`_, License: MIT

48
gulpfile.js
View File

@ -119,30 +119,40 @@ gulp.task('ckeditor-defaults', function () {
// CKEditor skins // CKEditor skins
gulp.task('ckeditor-skins', function () { gulp.task('ckeditor-skins', function () {
return gulp.src([ return gulp.src(
path.join('bower_components', 'ckeditor', 'skins', 'moono-lisa', '**', '*'), [
],{ base: path.join('bower_components', 'ckeditor', 'skins') }) path.join('bower_components', 'ckeditor', 'skins', 'moono-lisa', '**', '*'),
],
{
base: path.join('bower_components', 'ckeditor', 'skins')
}
)
.pipe(gulp.dest(path.join(output_directory, 'ckeditor', 'skins'))); .pipe(gulp.dest(path.join(output_directory, 'ckeditor', 'skins')));
}); });
// CKEditor plugins // CKEditor plugins
gulp.task('ckeditor-plugins', function () { gulp.task('ckeditor-plugins', function () {
return gulp.src([ return gulp.src(
path.join('bower_components', 'ckeditor', 'plugins', 'clipboard', '**', '*'), [
path.join('bower_components', 'ckeditor', 'plugins', 'colorbutton', '**', '*'), path.join('bower_components', 'ckeditor', 'plugins', 'clipboard', '**', '*'),
path.join('bower_components', 'ckeditor', 'plugins', 'dialog', '**', '*'), path.join('bower_components', 'ckeditor', 'plugins', 'colorbutton', '**', '*'),
path.join('bower_components', 'ckeditor', 'plugins', 'find', '**', '*'), path.join('bower_components', 'ckeditor', 'plugins', 'dialog', '**', '*'),
path.join('bower_components', 'ckeditor', 'plugins', 'image', '**', '*'), path.join('bower_components', 'ckeditor', 'plugins', 'find', '**', '*'),
path.join('bower_components', 'ckeditor', 'plugins', 'justify', '**', '*'), path.join('bower_components', 'ckeditor', 'plugins', 'image', '**', '*'),
path.join('bower_components', 'ckeditor', 'plugins', 'liststyle', '**', '*'), path.join('bower_components', 'ckeditor', 'plugins', 'justify', '**', '*'),
path.join('bower_components', 'ckeditor', 'plugins', 'magicline', '**', '*'), path.join('bower_components', 'ckeditor', 'plugins', 'liststyle', '**', '*'),
path.join('bower_components', 'ckeditor', 'plugins', 'pastefromword', '**', '*'), path.join('bower_components', 'ckeditor', 'plugins', 'magicline', '**', '*'),
path.join('bower_components', 'ckeditor', 'plugins', 'panelbutton', '**', '*'), path.join('bower_components', 'ckeditor', 'plugins', 'pastefromword', '**', '*'),
path.join('bower_components', 'ckeditor', 'plugins', 'showblocks', '**', '*'), path.join('bower_components', 'ckeditor', 'plugins', 'panelbutton', '**', '*'),
path.join('bower_components', 'ckeditor', 'plugins', 'sourcedialog', '**', '*'), path.join('bower_components', 'ckeditor', 'plugins', 'showblocks', '**', '*'),
path.join('bower_components', 'ckeditor', 'plugins', 'table', '**', '*'), path.join('bower_components', 'ckeditor', 'plugins', 'sourcedialog', '**', '*'),
path.join('bower_components', 'ckeditor', 'plugins', 'tabeltools', '**', '*'), path.join('bower_components', 'ckeditor', 'plugins', 'table', '**', '*'),
],{ base: path.join('bower_components', 'ckeditor', 'plugins') }) path.join('bower_components', 'ckeditor', 'plugins', 'tabeltools', '**', '*'),
],
{
base: path.join('bower_components', 'ckeditor', 'plugins')
}
)
.pipe(gulp.dest(path.join(output_directory, 'ckeditor', 'plugins'))); .pipe(gulp.dest(path.join(output_directory, 'ckeditor', 'plugins')));
}); });

14
requirements_production.txt
View File

@ -1,10 +1,10 @@
# Requirements for OpenSlides in production in alphabetical order # Requirements for OpenSlides in production in alphabetical order
Django>=1.10.1,<1.11 channels>=0.17,<1.0
channels>=0.15,<1.0 Django>=1.10.4,<1.11
djangorestframework>=3.4,<3.5 djangorestframework>=3.4,<3.5
jsonfield>=0.9.19,<1.1 jsonfield>=1.0,<1.1
PyPDF2>=1.25.0,<1.27 PyPDF2>=1.26,<1.27
roman>=2.0,<2.1 roman>=2.0,<2.1
setuptools>=18.5,<28.0 setuptools>=18.5,<33.0
twisted>=16.2,<16.4 Twisted>=16.6,<16.7
Whoosh>=2.7.0,<2.8 Whoosh>=2.7,<2.8