diff --git a/Dockerfile b/Dockerfile index 97a73801e245169ac799f004616cc7a000dca612..79b6e3c8149a5231df12cf6cd35004b2398d082b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,7 +34,7 @@ RUN eatmydata pip install poetry; \ # Install core COPY aleksis ./aleksis/ -COPY LICENCE README.rst manage.py ./ +COPY LICENCE.rst README.rst manage.py ./ RUN mkdir -p /var/lib/aleksis/media /var/lib/aleksis/static /var/lib/aleksis/backups; \ poetry build && eatmydata pip install dist/*.whl diff --git a/MANIFEST.in b/MANIFEST.in index ced3d3fc2a3b99f391b9c4d998292fa13d4e201b..1d638b733aac85446e592f6871c7161f8009d5a6 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,6 @@ include CODE_OF_CONDUCT.rst include CONTRIBUTING.rst -include LICENCE +include LICENCE.rst include manage.py recursive-include aleksis/core/static * recursive-include aleksis/core/templates * diff --git a/README.rst b/README.rst index 2d18bb23c8e2ba858925fe0b9a73a1d41515c628..a458d60029dbb67ee6f66f906bc0dc24df883c07 100644 --- a/README.rst +++ b/README.rst @@ -36,17 +36,17 @@ Licence :: Copyright © 2019, 2020 Dominik George <dominik.george@teckids.org> - Copyright © 2019 Martin Gummi <martin.gummi@teckids.org> - Copyright © 2019 Julian Leucker <leuckeju@katharineum.de> - Copyright © 2019 mirabilos <thorsten.glaser@teckids.org> - Copyright © 2018, 2019 Frank Poetzsch-Heffter <p-h@katharineum.de> + Copyright © 2019, 2020 Martin Gummi <martin.gummi@teckids.org> + Copyright © 2018, 2019, 2020 Julian Leucker <leuckeju@katharineum.de> + Copyright © 2019, 2020 mirabilos <thorsten.glaser@teckids.org> + Copyright © 2017, 2018, 2019 Frank Poetzsch-Heffter <p-h@katharineum.de> Copyright © 2019, 2020 Tom Teichler <tom.teichler@teckids.org> - Copyright © 2018, 2019, 2020 Jonathan Weth <wethjo@katharineum.de> - Copyright © 2019, 2020 Hangzhi Yu <yuha@katharineum.de> + Copyright © 2017, 2018, 2019, 2020 Jonathan Weth <wethjo@katharineum.de> + Copyright © 2018, 2019, 2020 Hangzhi Yu <yuha@katharineum.de> Licenced under the EUPL, version 1.2 or later -Please see the LICENCE file accompanying this distribution for the +Please see the LICENCE.rst file accompanying this distribution for the full licence text or on the `European Union Public Licence`_ website https://joinup.ec.europa.eu/collection/eupl/guidelines-users-and-developers (including all other official language versions). diff --git a/aleksis/core/meta.py b/aleksis/core/meta.py deleted file mode 100644 index 9af2f86c59f640d67970a38470a11f3f616d5fbe..0000000000000000000000000000000000000000 --- a/aleksis/core/meta.py +++ /dev/null @@ -1,64 +0,0 @@ -import os -from django.conf import settings - -# Build path for copyright -copyright_path = os.path.abspath(os.path.join(settings.BASE_DIR, '..', 'COPYRIGHT.md')) - -# Read copyright from file -with open(copyright_path, "r") as f: - COPYRIGHT = f.read() - -COPYRIGHT_SHORT = "© 2018–2019 Mitglieder der Computer-AG, Katharineum zu Lübeck" - -VERSION = '1.1.4 "Aebli"' - -LICENSE_APACHE_2 = "Apache 2.0 License" -LICENSE_BSD = "2-Clause BSD License" -LICENSE_BSD_3 = "3-Clause BSD License" -LICENSE_MIT = "MIT License" -LICENSE_GPL_V2 = "GNU General Public License v2.0" -LICENSE_GPL_V3 = "GNU General Public License v3.0" - -OPEN_SOURCE_COMPONENTS = [ - # ("Docker (u.a. Engine, CLI, docker-compose)", "https://github.com/docker", LICENSE_APACHE_2, - # "https://github.com/docker/docker/blob/master/LICENSE"), - ("Django", "https://www.djangoproject.com/", "Django BSD License", - "https://github.com/django/django/blob/master/LICENSE"), - ("Python 3", "https://www.python.org/", "PSF LICENSE AGREEMENT FOR PYTHON", - "https://docs.python.org/3/license.html"), - ("jQuery", "https://jquery.com/", LICENSE_MIT, "https://github.com/jquery/jquery/blob/master/LICENSE.txt"), - ("pip", "https://pypi.org/project/pip/", LICENSE_MIT, "https://github.com/pypa/pip/blob/master/LICENSE.txt"), - ("Requests", "https://requests.kennethreitz.org/", LICENSE_APACHE_2, - "https://github.com/psf/requests/blob/master/LICENSE"), - ("django-widget-tweaks", "https://github.com/jazzband/django-widget-tweaks", LICENSE_MIT, - "https://github.com/jazzband/django-widget-tweaks/blob/master/LICENSE"), - ("Materialize CSS", "https://materializecss.com/", LICENSE_MIT, - "https://github.com/Dogfalo/materialize/blob/master/LICENSE"), - ("Material Design Icons", "http://google.github.io/material-design-icons/", LICENSE_APACHE_2, - "https://github.com/google/material-design-icons/blob/master/LICENSE"), - ("highlight.js", "https://highlightjs.org/", LICENSE_BSD_3, - "https://github.com/highlightjs/highlight.js/blob/master/LICENSE"), - ("React", "https://reactjs.org/", LICENSE_MIT, "https://github.com/facebook/react/blob/master/LICENSE"), - ("mysqlclient", "https://github.com/PyMySQL/mysqlclient-python", LICENSE_GPL_V2, - "https://github.com/PyMySQL/mysqlclient-python/blob/master/LICENSE"), - ("django-auth-ldap", "https://github.com/django-auth-ldap/django-auth-ldap", LICENSE_BSD, - "https://github.com/django-auth-ldap/django-auth-ldap/blob/master/LICENSE"), - ("django-dbsettings", "https://github.com/zlorf/django-dbsettings", LICENSE_BSD_3, - "https://github.com/zlorf/django-dbsettings/blob/master/LICENSE"), - ("Django PDB", "https://github.com/HassenPy/django-pdb", "Public Domain", ""), - ("Django Material", "https://github.com/viewflow/django-material", LICENSE_BSD_3, - "https://github.com/viewflow/django-material/blob/master/LICENSE.txt"), - ("Django Filter", "https://github.com/carltongibson/django-filter", LICENSE_BSD_3, - "https://github.com/carltongibson/django-filter/blob/master/LICENSE"), - ("django-react-templatetags", "https://github.com/Frojd/django-react-templatetags", LICENSE_MIT, - "https://github.com/Frojd/django-react-templatetags/blob/develop/LICENSE"), - ("martor", "https://github.com/agusmakmun/django-markdown-editor", LICENSE_GPL_V3, - "https://github.com/agusmakmun/django-markdown-editor/blob/master/LICENSE"), - ("Babel", "https://babeljs.io/", LICENSE_MIT, "https://github.com/babel/babel/blob/master/LICENSE") -] -OPEN_SOURCE_COMPONENTS.sort(key=lambda elem: elem[0].lower()) - - -# Provide vars to all templates via processor -def meta_processor(request): - return {'COPYRIGHT': COPYRIGHT, "COPYRIGHT_SHORT": COPYRIGHT_SHORT, "VERSION": VERSION} diff --git a/aleksis/core/migrations/0003_auto_20200105_1832.py b/aleksis/core/migrations/0003_replace_user_by_person.py similarity index 100% rename from aleksis/core/migrations/0003_auto_20200105_1832.py rename to aleksis/core/migrations/0003_replace_user_by_person.py diff --git a/apps/official/AlekSIS-App-Alsijil b/apps/official/AlekSIS-App-Alsijil index a3428a20de951cf555258375bd120979ed721b12..5cd79a163b1f0c26ba5962f113b2a412c111cab8 160000 --- a/apps/official/AlekSIS-App-Alsijil +++ b/apps/official/AlekSIS-App-Alsijil @@ -1 +1 @@ -Subproject commit a3428a20de951cf555258375bd120979ed721b12 +Subproject commit 5cd79a163b1f0c26ba5962f113b2a412c111cab8 diff --git a/apps/official/AlekSIS-App-Chronos b/apps/official/AlekSIS-App-Chronos index 39d6341d693448c079fecbea16b5c75be66aa217..c910b2efbefdbf7d7bc1fb06ba9c66e558180323 160000 --- a/apps/official/AlekSIS-App-Chronos +++ b/apps/official/AlekSIS-App-Chronos @@ -1 +1 @@ -Subproject commit 39d6341d693448c079fecbea16b5c75be66aa217 +Subproject commit c910b2efbefdbf7d7bc1fb06ba9c66e558180323 diff --git a/apps/official/AlekSIS-App-Exlibris b/apps/official/AlekSIS-App-Exlibris index e3899afda670034038afe403e9b1878fc3cbae92..bdbb7de7d36c2daee2f29e7db76e39c4da223ec8 160000 --- a/apps/official/AlekSIS-App-Exlibris +++ b/apps/official/AlekSIS-App-Exlibris @@ -1 +1 @@ -Subproject commit e3899afda670034038afe403e9b1878fc3cbae92 +Subproject commit bdbb7de7d36c2daee2f29e7db76e39c4da223ec8 diff --git a/apps/official/AlekSIS-App-SchILD-NRW b/apps/official/AlekSIS-App-SchILD-NRW index 3b129f2449ec298deeb5123e67f70a8693c410a5..2a05128f1a82a64183a5dc835c5a66a101cbd16b 160000 --- a/apps/official/AlekSIS-App-SchILD-NRW +++ b/apps/official/AlekSIS-App-SchILD-NRW @@ -1 +1 @@ -Subproject commit 3b129f2449ec298deeb5123e67f70a8693c410a5 +Subproject commit 2a05128f1a82a64183a5dc835c5a66a101cbd16b diff --git a/apps/official/AlekSIS-App-Untis b/apps/official/AlekSIS-App-Untis index c569c48016b3b195a7e705c280b36c2338f47b6a..1b10067d83fceafbd4dd643203a512f3585980ae 160000 --- a/apps/official/AlekSIS-App-Untis +++ b/apps/official/AlekSIS-App-Untis @@ -1 +1 @@ -Subproject commit c569c48016b3b195a7e705c280b36c2338f47b6a +Subproject commit 1b10067d83fceafbd4dd643203a512f3585980ae