Merge pull request #3523 from emanuelschuetze/release2.2b1

Release2.2b1

README.rst

@@ -170,42 +170,51 @@ OpenSlides uses the following projects or parts of them:
 
   * `angular <http://angularjs.org>`_, License: MIT
   * `angular-animate <http://angularjs.org>`_, License: MIT
-  * `angular-bootstrap <http://angular-ui.github.io/bootstrap>`_, License: MIT
   * `angular-bootstrap-colorpicker <https://github.com/buberdds/angular-bootstrap-colorpicker>`_, License: MIT
   * `angular-chosen-localytics <http://github.com/leocaseiro/angular-chosen>`_, License: MIT
-  * `angular-ckeditor <https://github.com/lemonde/angular-ckeditor/>`_, License: MIT
+  * `angular-ckeditor <https://github.com/lemonde/angular-ckeditor>`_, License: MIT
+  * `angular-file-saver <https://github.com/alferov/angular-file-saver>`_, License: MIT
   * `angular-formly <http://formly-js.github.io/angular-formly/>`_, License: MIT
-  * `angular-formly-templates-bootstrap <https://github.com/formly-js/angular-formly-templates-bootstrap>`_, License: MIT
+  * `angular-formly-templates-bootstrap <http://formly-js.github.io/angular-formly-templates-bootstrap/>`_, License: MIT
   * `angular-gettext <http://angular-gettext.rocketeer.be/>`_, License: MIT
   * `angular-messages <http://angularjs.org>`_, License: MIT
-  * `pdfmake <https://github.com/bpampuch/pdfmake>`_, License: MIT
   * `angular-pdf <http://github.com/sayanee/angularjs-pdf>`_, License: MIT
   * `angular-sanitize <http://angularjs.org>`_, License: MIT
   * `angular-scroll-glue <https://github.com/Luegg/angularjs-scroll-glue>`_, License: MIT
+  * `angular-ui-bootstrap <http://angular-ui.github.io/bootstrap/>`_, License: MIT
   * `angular-ui-router <http://angular-ui.github.io/ui-router/>`_, License: MIT
+  * `angular-ui-router-title <https://github.com/nonplus/angular-ui-router-title>`_, License: MIT
   * `angular-ui-tree <https://github.com/angular-ui-tree/angular-ui-tree>`_, License: MIT
-  * `angular-xeditable <https://github.com/vitalets/angular-xeditable>`_, License: MIT
+  * `angular-xeditable <http://vitalets.github.io/angular-xeditable>`_, License: MIT
+  * `angularjs-scroll-glue <https://github.com/Luegg/angularjs-scroll-glue>`_, License: MIT
   * `angularjs-slider <https://github.com/angular-slider/angularjs-slider>`_, License: MIT
   * `api-check <https://github.com/kentcdodds/api-check>`_, License: MIT
+  * `blob-polyfill <https://github.com/bjornstar/blob-polyfill>`_, License: MIT
   * `bootstrap <http://getbootstrap.com>`_, License: MIT
+  * `bootstrap <http://getbootstrap.com>`_, License: MIT
+  * `bootstrap-css-only <https://getbootstrap.com/>`_, License: MIT
+  * `bootstrap-css-only <http://getbootstrap.com>`_, License: MIT
   * `bootstrap-ui-datetime-picker <https://github.com/Gillardo/bootstrap-ui-datetime-picker>`_, License: MIT
-  * `chosen <http://harvesthq.github.io/chosen/>`_, License: MIT
-  * `ckeditor <http://ckeditor.com>`_,  License: GPL 2+, LGPL 2.1+ or MPL 1.1.
+  * `chosen <https://harvesthq.github.io/chosen/>`_, License: https://github.com/harvesthq/chosen/blob/master/LICENSE.md
+  * `chosen-js <https://harvesthq.github.io/chosen/>`_, License: MIT
+  * `ckeditor <http://ckeditor.com>`_, License: (GPL-2.0 OR LGPL-2.1 OR MPL-1.1)
+  * `docxtemplater <https://github.com/open-xml-templating/docxtemplater>`_, License: MIT
+  * `file-saver.js <https://github.com/Teleborder/FileSaver.js>`_, License: LICENSE.md
   * `font-awesome-bower <https://github.com/tdg5/font-awesome-bower>`_, License: MIT
   * `jquery <https://jquery.com>`_, License: MIT
   * `jquery.cookie <https://plugins.jquery.com/cookie>`_, License: MIT
   * `js-data <http://www.js-data.io>`_, License: MIT
-  * `js-data-angular <http://www.js-data.io/docs/js-data-angular>`_, License: MIT
-  * `js-data-http <http://www.js-data.io/docs/dshttpadapter>`_, License: MIT
+  * `js-data-angular <https://github.com/js-data/js-data-angular>`_, License: MIT
+  * `jszip <http://stuartk.com/jszip>`_, License: MIT or GPLv3
   * `lodash <https://lodash.com/>`_, License: MIT
   * `ng-dialog <https://github.com/likeastore/ngDialog>`_, License: MIT
   * `ng-file-upload <https://github.com/danialfarid/ng-file-upload>`_, License: MIT
-  * `ngStorage <https://github.com/gsklee/ngStorage>`_, License: MIT
   * `ngbootbox <https://github.com/eriktufvesson/ngBootbox>`_, License: MIT
-  * `open-sans-fontface <https://github.com/FontFaceKit/open-sans>`_, License: Apache License version 2.0
-  * `Papa Parse <http://papaparse.com/>`_, License: MIT
+  * `ngStorage <https://github.com/gsklee/ngStorage>`_, License: MIT
+  * `papaparse <http://papaparse.com>`_, License: MIT
   * `pdfjs-dist <http://mozilla.github.io/pdf.js/>`_, License: Apache-2.0
-  * `roboto-condensed <https://github.com/davidcunningham/roboto-condensed>`_, License: Apache 2.0
+  * `pdfmake <https://bpampuch.github.io/pdfmake>`_, License: MIT
+  * `roboto-fontface <https://github.com/choffmeister/roboto-fontface-bower>`_, License: Apache-2.0
 
 
 License and authors

openslides/__init__.py

@@ -1,5 +1,5 @@
 __author__ = 'OpenSlides Team <support@openslides.org>'
 __description__ = 'Presentation and assembly system'
-__version__ = '2.1.2-dev'
+__version__ = '2.2b2-dev'
 __license__ = 'MIT'
 __url__ = 'https://openslides.org'

setup.py

@@ -27,8 +27,8 @@ setup(
     classifiers=[
         # http://pypi.python.org/pypi?%3Aaction=list_classifiers
         # 'Development Status :: 3 - Alpha',
-        # 'Development Status :: 4 - Beta',
-        'Development Status :: 5 - Production/Stable',
+        'Development Status :: 4 - Beta',
+        #'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'Framework :: Django',
         'License :: OSI Approved :: MIT License',