diff --git a/.gitignore b/.gitignore index 9d218124e6ea053643309cf65d03fbf71c7a9096..ed90f2f7a841da90717ad986c7bb57dbc86a8876 100644 --- a/.gitignore +++ b/.gitignore @@ -62,8 +62,8 @@ docs/_build/ *.aux # Generated files -biscuit/node_modules/ -biscuit/static/ +aleksis/node_modules/ +aleksis/static/ .coverage .mypy_cache/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c10ca191a8ab442025575b0636d42812ccb5d0e6..0fbcadf4c406631f4ac1de9cca65415362a53da3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -92,7 +92,7 @@ deploy_demo-master: stage: deploy environment: name: demo/master - url: http://demo-master.biscuit-sis.org + url: http://demo-master.aleksis.org before_script: - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' - eval $(ssh-agent -s) @@ -102,18 +102,18 @@ deploy_demo-master: - echo "$SSH_KNOWN_HOSTS" >~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts script: - - grep -v "build:" docker-compose.yml | ssh root@demo-master.biscuit-sis.org - env BISCUIT_IMAGE_TAG=${CI_COMMIT_REF_NAME} + - grep -v "build:" docker-compose.yml | ssh root@demo-master.aleksis.org + env ALEKSIS_IMAGE_TAG=${CI_COMMIT_REF_NAME} docker-compose - -p biscuit-${CI_ENVIRONMENT_SLUG} + -p aleksis-${CI_ENVIRONMENT_SLUG} -f /dev/stdin pull - - grep -v "build:" docker-compose.yml | ssh root@demo-master.biscuit-sis.org - env BISCUIT_IMAGE_TAG=${CI_COMMIT_REF_NAME} + - grep -v "build:" docker-compose.yml | ssh root@demo-master.aleksis.org + env ALEKSIS_IMAGE_TAG=${CI_COMMIT_REF_NAME} NGINX_HTTP_PORT=80 - BISCUIT_maintenance__debug=true + ALEKSIS_maintenance__debug=true docker-compose - -p biscuit-${CI_ENVIRONMENT_SLUG} + -p aleksis-${CI_ENVIRONMENT_SLUG} -f /dev/stdin up -d only: diff --git a/.gitmodules b/.gitmodules index fd1946b12b42dd4783aed092e0500769078f5634..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,20 +0,0 @@ -[submodule "apps/official/BiscuIT-App-Exlibris"] - path = apps/official/BiscuIT-App-Exlibris - url = https://edugit.org/BiscuIT/BiscuIT-App-Exlibris - ignore = untracked -[submodule "apps/official/BiscuIT-App-Chronos"] - path = apps/official/BiscuIT-App-Chronos - url = https://edugit.org/BiscuIT/BiscuIT-App-Chronos - ignore = untracked -[submodule "apps/official/BiscuIT-App-Untis"] - path = apps/official/BiscuIT-App-Untis - url = https://edugit.org/BiscuIT/BiscuIT-App-Untis - ignore = untracked -[submodule "apps/official/BiscuIT-App-SchILD-NRW"] - path = apps/official/BiscuIT-App-SchILD-NRW - url = https://edugit.org/BiscuIT/BiscuIT-App-SchILD-NRW - ignore = untracked -[submodule "apps/official/BiscuIT-App-Alsijil"] - path = apps/official/BiscuIT-App-Alsijil - url = https://edugit.org/BiscuIT/BiscuIT-App-Alsijil - ignore = untracked diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e88765a522ee299d86ed6d2965ead5ef22035c74..f586217c4effb899056b000b9b3484af27f3e9b3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -50,6 +50,6 @@ Minor changes * Use bootstrap buttons everywhere -_`1.0a1`: https://edugit.org/Teckids/BiscuIT/BiscuIT-ng/-/tags/1.0a1 -_`1.0a2`: https://edugit.org/Teckids/BiscuIT/BiscuIT-ng/-/tags/1.0a2 -_`1.0a4`: https://edugit.org/Teckids/BiscuIT/BiscuIT-ng/-/tags/1.0a4 +_`1.0a1`: https://edugit.org/Teckids/AlekSIS/AlekSIS/-/tags/1.0a1 +_`1.0a2`: https://edugit.org/Teckids/AlekSIS/AlekSIS/-/tags/1.0a2 +_`1.0a4`: https://edugit.org/Teckids/AlekSIS/AlekSIS/-/tags/1.0a4 diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 8dd5324fd7c0c1ca5207c86f69329ea1a7e15a61..d1f55a61580c33875a3bcb3010f371a41d46664e 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -1,9 +1,9 @@ Development principles and contribution guidelines ================================================== -In order to create a high-quality software product, the BiscuIT developers +In order to create a high-quality software product, the AlekSIS developers have agreed upon fundamental principles governing the code layout, coding -style and repository management for BiscuIT and all official apps. +style and repository management for AlekSIS and all official apps. Coding layout and style @@ -23,8 +23,8 @@ decisions: 1. Standard library imports 2. Django imports 3. Third-party imports - 4. Imports from BiscuIT core and other apps (absolute imports) - 5. Imports from the same BiscuIT app (realtive imports) + 4. Imports from AlekSIS core and other apps (absolute imports) + 5. Imports from the same AlekSIS app (realtive imports) Use `isort` to take care of this @@ -77,7 +77,7 @@ Manifestos governing development The FOSS community has created some manifestos describing several aspects of software development, to agree upon a baseline for these aspects. The -BiscuIT developers have agreed to adhere to the following manifestos: +AlekSIS developers have agreed to adhere to the following manifestos: - The `Sane software manifesto`_ - The `Accessibility Manifesto`_ @@ -96,7 +96,7 @@ The case on supporting non-free services Defined by the `Free Software Definition`_, it is an essential freedom to be allowed to use free software for any purpose, without limitation. Thus, interoperability with non-free services shall not be ruled out, and the -BiscuIT project explicitly welcomes implementing support for +AlekSIS project explicitly welcomes implementing support for interoperability with non-free services. However, to purposefullt foster free software and services, if diff --git a/Dockerfile b/Dockerfile index a377af5a6194b2e0c528eecae2431508e53d73d3..97a73801e245169ac799f004616cc7a000dca612 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,9 +8,9 @@ ENV PIP_DISABLE_PIP_VERSION_CHECK 1 ENV PIP_NO_CACHE_DIR 1 # Configure app settings for build and runtime -ENV BISCUIT_static__root /var/lib/biscuit/static -ENV BISCUIT_media__root /var/lib/biscuit/media -ENV BISCUIT_backup__location /var/lib/biscuit/backups +ENV ALEKSIS_static__root /var/lib/aleksis/static +ENV ALEKSIS_media__root /var/lib/aleksis/media +ENV ALEKSIS_backup__location /var/lib/aleksis/backups # Install necessary Debian packages for build and runtime RUN apt-get -y update && \ @@ -33,9 +33,9 @@ RUN eatmydata pip install poetry; \ eatmydata pip install gunicorn # Install core -COPY biscuit ./biscuit/ +COPY aleksis ./aleksis/ COPY LICENCE README.rst manage.py ./ -RUN mkdir -p /var/lib/biscuit/media /var/lib/biscuit/static /var/lib/biscuit/backups; \ +RUN mkdir -p /var/lib/aleksis/media /var/lib/aleksis/static /var/lib/aleksis/backups; \ poetry build && eatmydata pip install dist/*.whl # Build messages and assets @@ -56,7 +56,7 @@ RUN eatmydata apt-get remove --purge -y \ rm -rf /root/.cache # Declare a persistent volume for all data -VOLUME /var/lib/biscuit +VOLUME /var/lib/aleksis # Define entrypoint and gunicorn running on port 8000 EXPOSE 8000 diff --git a/MANIFEST.in b/MANIFEST.in index 9145ce4a03a7244a2637966e38c631672d9531ff..ced3d3fc2a3b99f391b9c4d998292fa13d4e201b 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2,7 +2,7 @@ include CODE_OF_CONDUCT.rst include CONTRIBUTING.rst include LICENCE include manage.py -recursive-include biscuit/core/static * -recursive-include biscuit/core/templates * -recursive-include biscuit/core/migrations * +recursive-include aleksis/core/static * +recursive-include aleksis/core/templates * +recursive-include aleksis/core/migrations * recursive-include docs * diff --git a/aleksis/core/__init__.py b/aleksis/core/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..2484be76410f3d59a7bed7dda78c5f4e0f2a1c63 --- /dev/null +++ b/aleksis/core/__init__.py @@ -0,0 +1,8 @@ +import pkg_resources + +try: + __version__ = pkg_resources.get_distribution("AlekSIS").version +except Exception: + __version__ = "unknown" + +default_app_config = "aleksis.core.apps.CoreConfig" diff --git a/biscuit/core/admin.py b/aleksis/core/admin.py similarity index 100% rename from biscuit/core/admin.py rename to aleksis/core/admin.py diff --git a/biscuit/core/anonymizers.py b/aleksis/core/anonymizers.py similarity index 100% rename from biscuit/core/anonymizers.py rename to aleksis/core/anonymizers.py diff --git a/biscuit/core/apps.py b/aleksis/core/apps.py similarity index 74% rename from biscuit/core/apps.py rename to aleksis/core/apps.py index 5c5b3093b16309d23ffa0a985e7458fe356b800b..1647161460720845a42f4b5896622048b32c07ae 100644 --- a/biscuit/core/apps.py +++ b/aleksis/core/apps.py @@ -5,8 +5,8 @@ from .signals import clean_scss class CoreConfig(AppConfig): - name = "biscuit.core" - verbose_name = "BiscuIT - The Free School Information System" + name = "aleksis.core" + verbose_name = "AlekSIS — The Free School Information System" def ready(self) -> None: clean_scss() diff --git a/biscuit/core/dashboard/README.md b/aleksis/core/dashboard/README.md similarity index 100% rename from biscuit/core/dashboard/README.md rename to aleksis/core/dashboard/README.md diff --git a/biscuit/core/dashboard/__init__.py b/aleksis/core/dashboard/__init__.py similarity index 100% rename from biscuit/core/dashboard/__init__.py rename to aleksis/core/dashboard/__init__.py diff --git a/biscuit/core/dashboard/admin.py b/aleksis/core/dashboard/admin.py similarity index 100% rename from biscuit/core/dashboard/admin.py rename to aleksis/core/dashboard/admin.py diff --git a/biscuit/core/dashboard/apps.py b/aleksis/core/dashboard/apps.py similarity index 100% rename from biscuit/core/dashboard/apps.py rename to aleksis/core/dashboard/apps.py diff --git a/biscuit/core/dashboard/migrations/__init__.py b/aleksis/core/dashboard/migrations/__init__.py similarity index 100% rename from biscuit/core/dashboard/migrations/__init__.py rename to aleksis/core/dashboard/migrations/__init__.py diff --git a/biscuit/core/dashboard/models.py b/aleksis/core/dashboard/models.py similarity index 100% rename from biscuit/core/dashboard/models.py rename to aleksis/core/dashboard/models.py diff --git a/biscuit/core/dashboard/settings.py b/aleksis/core/dashboard/settings.py similarity index 100% rename from biscuit/core/dashboard/settings.py rename to aleksis/core/dashboard/settings.py diff --git a/biscuit/core/dashboard/templates/dashboard/index.html b/aleksis/core/dashboard/templates/dashboard/index.html similarity index 100% rename from biscuit/core/dashboard/templates/dashboard/index.html rename to aleksis/core/dashboard/templates/dashboard/index.html diff --git a/biscuit/core/dashboard/urls.py b/aleksis/core/dashboard/urls.py similarity index 100% rename from biscuit/core/dashboard/urls.py rename to aleksis/core/dashboard/urls.py diff --git a/biscuit/core/dashboard/views/dashboard.py b/aleksis/core/dashboard/views/dashboard.py similarity index 100% rename from biscuit/core/dashboard/views/dashboard.py rename to aleksis/core/dashboard/views/dashboard.py diff --git a/biscuit/core/dashboard/views/tools.py b/aleksis/core/dashboard/views/tools.py similarity index 100% rename from biscuit/core/dashboard/views/tools.py rename to aleksis/core/dashboard/views/tools.py diff --git a/biscuit/core/decorators.py b/aleksis/core/decorators.py similarity index 100% rename from biscuit/core/decorators.py rename to aleksis/core/decorators.py diff --git a/biscuit/core/forms.py b/aleksis/core/forms.py similarity index 100% rename from biscuit/core/forms.py rename to aleksis/core/forms.py diff --git a/biscuit/core/locale/ar/LC_MESSAGES/django.po b/aleksis/core/locale/ar/LC_MESSAGES/django.po similarity index 96% rename from biscuit/core/locale/ar/LC_MESSAGES/django.po rename to aleksis/core/locale/ar/LC_MESSAGES/django.po index 16a53f93fa191b23c79c6b5aa512c8933477187a..55d74712759f1d4b7f69d86bc87acf10b6f1c0e1 100644 --- a/biscuit/core/locale/ar/LC_MESSAGES/django.po +++ b/aleksis/core/locale/ar/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: AlekSIS (School Information System) 0.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-23 10:06+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" @@ -91,7 +91,7 @@ msgid "Persons and accounts" msgstr "" #: menus.py:80 -msgid "BiscuIT Software" +msgid "AlekSIS Software" msgstr "" #: menus.py:84 @@ -258,7 +258,7 @@ msgstr "" #: templates/403.html:16 templates/404.html:20 msgid "" "\n" -" If you think this is an error in BiscuIT, please contact your site\n" +" If you think this is an error in AlekSIS, please contact your site\n" " administrators.\n" " " msgstr "" @@ -373,14 +373,14 @@ msgstr "" #: templates/core/index.html:8 msgid "" "\n" -" BiscuIT School Information System (SIS)\n" +" AlekSIS (School Information System)\n" " " msgstr "" #: templates/core/index.html:16 msgid "" "\n" -" BiscuIT is a web-based school information system (SIS) which can be " +" AlekSIS is a web-based school information system (SIS) which can be " "used to\n" " manage and/or publish organisational data of educational " "institutions.\n" @@ -403,7 +403,7 @@ msgid "" "\n" " Your user account is not linked to a person. This means you\n" " cannot access any school-related information. Please contact\n" -" the managers of BiscuIT at your school.\n" +" the managers of AlekSIS at your school.\n" " " msgstr "" diff --git a/biscuit/core/locale/de_DE/LC_MESSAGES/django.po b/aleksis/core/locale/de_DE/LC_MESSAGES/django.po similarity index 64% rename from biscuit/core/locale/de_DE/LC_MESSAGES/django.po rename to aleksis/core/locale/de_DE/LC_MESSAGES/django.po index 2e8ed88584b0d7f536a93643ddcb9f47d53af293..9ae328e185525ff9f6860c63a2b5811c8c70cb89 100644 --- a/biscuit/core/locale/de_DE/LC_MESSAGES/django.po +++ b/aleksis/core/locale/de_DE/LC_MESSAGES/django.po @@ -5,13 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: BiscuIT - School Information System (SIS)\n" +"Project-Id-Version: AlekSIS (School Information System) 0.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-01-01 20:19+0000\n" "PO-Revision-Date: 2019-09-17 21:08+0000\n" "Last-Translator: Tom Teichler <tom.teichler@teckids.org>\n" -"Language-Team: German <https://translate.edugit.org/projects/biscuit-sis/" -"biscuit-ng/de/>\n" +"Language-Team: German <https://translate.edugit.org/projects/aleksis/biscuit-ng/de/>\n" "Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,262 +18,262 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 3.8\n" -#: biscuit/core/forms.py:30 biscuit/core/forms.py:85 +#: aleksis/core/forms.py:30 aleksis/core/forms.py:85 msgid "You cannot set a new username when also selecting an existing user." msgstr "" "Sie können keine neuen Benutzer erstellen, wenn Sie gleichzeitig einen " "existierenden Benutzer auswählen." -#: biscuit/core/forms.py:33 biscuit/core/forms.py:88 +#: aleksis/core/forms.py:33 aleksis/core/forms.py:88 msgid "This username is already in use." msgstr "Dieser Benutzername wird bereits genutzt." -#: biscuit/core/forms.py:75 +#: aleksis/core/forms.py:75 msgid "New user" msgstr "Neuer Benutzer" -#: biscuit/core/forms.py:75 +#: aleksis/core/forms.py:75 msgid "Create a new account" msgstr "Neues Benutzerkonto erstellen" -#: biscuit/core/menus.py:7 biscuit/core/templates/registration/login.html:21 -#: biscuit/core/templates/two_factor/core/login.html:6 -#: biscuit/core/templates/two_factor/core/login.html:59 +#: aleksis/core/menus.py:7 aleksis/core/templates/registration/login.html:21 +#: aleksis/core/templates/two_factor/core/login.html:6 +#: aleksis/core/templates/two_factor/core/login.html:59 msgid "Login" msgstr "Anmelden" -#: biscuit/core/menus.py:13 +#: aleksis/core/menus.py:13 msgid "Account" msgstr "Konto" -#: biscuit/core/menus.py:20 +#: aleksis/core/menus.py:20 msgid "Stop impersonation" msgstr "Verkleidung beenden" -#: biscuit/core/menus.py:29 biscuit/core/templates/core/base.html:49 +#: aleksis/core/menus.py:29 aleksis/core/templates/core/base.html:49 msgid "Logout" msgstr "Abmelden" -#: biscuit/core/menus.py:35 +#: aleksis/core/menus.py:35 msgid "Two factor auth" msgstr "" -#: biscuit/core/menus.py:46 +#: aleksis/core/menus.py:46 msgid "Admin" msgstr "Admin" -#: biscuit/core/menus.py:55 biscuit/core/templates/core/data_management.html:6 +#: aleksis/core/menus.py:55 aleksis/core/templates/core/data_management.html:6 msgid "Data management" msgstr "Datenverwaltung" -#: biscuit/core/menus.py:64 biscuit/core/templates/core/system_status.html:7 +#: aleksis/core/menus.py:64 aleksis/core/templates/core/system_status.html:7 msgid "System status" msgstr "System-Status" -#: biscuit/core/menus.py:73 +#: aleksis/core/menus.py:73 msgid "Impersonation" msgstr "Verkleidung" -#: biscuit/core/menus.py:82 +#: aleksis/core/menus.py:82 msgid "Manage school" msgstr "Schulverwaltung" -#: biscuit/core/menus.py:93 +#: aleksis/core/menus.py:93 msgid "People" msgstr "Leute" -#: biscuit/core/menus.py:102 biscuit/core/templates/core/persons.html:8 -#: biscuit/core/templates/core/persons.html:10 +#: aleksis/core/menus.py:102 aleksis/core/templates/core/persons.html:8 +#: aleksis/core/templates/core/persons.html:10 msgid "Persons" msgstr "Personen" -#: biscuit/core/menus.py:107 biscuit/core/templates/core/groups.html:8 -#: biscuit/core/templates/core/groups.html:10 -#: biscuit/core/templates/core/person_full.html:66 +#: aleksis/core/menus.py:107 aleksis/core/templates/core/groups.html:8 +#: aleksis/core/templates/core/groups.html:10 +#: aleksis/core/templates/core/person_full.html:66 msgid "Groups" msgstr "Gruppen" -#: biscuit/core/menus.py:112 +#: aleksis/core/menus.py:112 msgid "Persons and accounts" msgstr "Personen und Konten" -#: biscuit/core/menus.py:123 +#: aleksis/core/menus.py:123 msgid "Website" msgstr "Website" -#: biscuit/core/menus.py:129 +#: aleksis/core/menus.py:129 msgid "Edit school information" msgstr "Schulinformationen bearbeiten" -#: biscuit/core/menus.py:130 biscuit/core/templates/core/edit_schoolterm.html:8 +#: aleksis/core/menus.py:130 aleksis/core/templates/core/edit_schoolterm.html:8 msgid "Edit school term" msgstr "Schuljahr bearbeiten" -#: biscuit/core/migrations/0001_initial.py:15 +#: aleksis/core/migrations/0001_initial.py:15 msgid "Default school" msgstr "Standardschule" -#: biscuit/core/migrations/0002_school_term.py:15 +#: aleksis/core/migrations/0002_school_term.py:15 msgid "Default term" msgstr "Standardschuljahr" -#: biscuit/core/models.py:35 +#: aleksis/core/models.py:35 msgid "Name" msgstr "Name" -#: biscuit/core/models.py:37 +#: aleksis/core/models.py:37 msgid "Official name" msgstr "Offizieller Name" -#: biscuit/core/models.py:39 +#: aleksis/core/models.py:39 msgid "Official name of the school, e.g. as given by supervisory authority" msgstr "" "Offizieller Name der Schule, wie er z.B. von der Behörde vorgegeben ist" -#: biscuit/core/models.py:42 +#: aleksis/core/models.py:42 msgid "School logo" msgstr "Schullogo" -#: biscuit/core/models.py:58 +#: aleksis/core/models.py:58 msgid "Visible caption of the term" msgstr "Sichtbare Beschriftung des Schuljahres" -#: biscuit/core/models.py:60 +#: aleksis/core/models.py:60 msgid "Effective start date of term" msgstr "Startdatum des Schuljahres" -#: biscuit/core/models.py:61 +#: aleksis/core/models.py:61 msgid "Effective end date of term" msgstr "Enddatum des Schuljahres" -#: biscuit/core/models.py:79 +#: aleksis/core/models.py:79 msgid "female" msgstr "weiblich" -#: biscuit/core/models.py:79 +#: aleksis/core/models.py:79 msgid "male" msgstr "männlich" -#: biscuit/core/models.py:84 +#: aleksis/core/models.py:84 msgid "Is person active?" msgstr "Ist die Person aktiv?" -#: biscuit/core/models.py:86 +#: aleksis/core/models.py:86 msgid "First name" msgstr "Vorname" -#: biscuit/core/models.py:87 +#: aleksis/core/models.py:87 msgid "Last name" msgstr "Nachname" -#: biscuit/core/models.py:89 +#: aleksis/core/models.py:89 msgid "Additional name(s)" msgstr "Zusätzliche Namen" -#: biscuit/core/models.py:93 +#: aleksis/core/models.py:93 msgid "Short name" msgstr "Kurzname" -#: biscuit/core/models.py:96 +#: aleksis/core/models.py:96 msgid "Street" msgstr "Straße" -#: biscuit/core/models.py:97 +#: aleksis/core/models.py:97 msgid "Street number" msgstr "Hausnummer" -#: biscuit/core/models.py:98 +#: aleksis/core/models.py:98 msgid "Postal code" msgstr "Postleitzahl" -#: biscuit/core/models.py:99 +#: aleksis/core/models.py:99 msgid "Place" msgstr "Ort" -#: biscuit/core/models.py:101 +#: aleksis/core/models.py:101 msgid "Home phone" msgstr "Festnetz" -#: biscuit/core/models.py:102 +#: aleksis/core/models.py:102 msgid "Mobile phone" msgstr "Handy" -#: biscuit/core/models.py:104 +#: aleksis/core/models.py:104 msgid "E-mail address" msgstr "E-Mail-Adresse" -#: biscuit/core/models.py:106 +#: aleksis/core/models.py:106 msgid "Date of birth" msgstr "Geburtsdatum" -#: biscuit/core/models.py:107 +#: aleksis/core/models.py:107 msgid "Sex" msgstr "Geschlecht" -#: biscuit/core/models.py:109 +#: aleksis/core/models.py:109 msgid "Photo" msgstr "Foto" -#: biscuit/core/models.py:113 +#: aleksis/core/models.py:113 msgid "Reference ID of import source" msgstr "Referenz-ID der Import-Quelle" -#: biscuit/core/models.py:122 +#: aleksis/core/models.py:122 msgid "Guardians / Parents" msgstr "Erziehungsberechtigte / Eltern" -#: biscuit/core/models.py:163 +#: aleksis/core/models.py:163 msgid "Long name of group" msgstr "Langer Name der Gruppe" -#: biscuit/core/models.py:164 +#: aleksis/core/models.py:164 msgid "Short name of group" msgstr "Kurzer Name der Gruppe" -#: biscuit/core/models.py:173 +#: aleksis/core/models.py:173 msgid "Parent groups" msgstr "Übergeordnete Gruppen" -#: biscuit/core/settings.py:213 +#: aleksis/core/settings.py:213 msgid "German" msgstr "Deutsch" -#: biscuit/core/settings.py:214 +#: aleksis/core/settings.py:214 msgid "English" msgstr "Englisch" -#: biscuit/core/templates/403.html:5 +#: aleksis/core/templates/403.html:5 msgid "Forbidden" msgstr "Verboten" -#: biscuit/core/templates/403.html:12 +#: aleksis/core/templates/403.html:12 msgid "You are not allowed to access the requested page or object." msgstr "" "Es ist Ihnen nicht erlaubt, auf die angefragte Seite oder das angefragte " "Objekt zuzugreifen." -#: biscuit/core/templates/403.html:16 biscuit/core/templates/404.html:20 +#: aleksis/core/templates/403.html:16 aleksis/core/templates/404.html:20 msgid "" "\n" -" If you think this is an error in BiscuIT, please contact your site\n" +" If you think this is an error in AlekSIS, please contact your site\n" " administrators.\n" " " msgstr "" "\n" -" Wenn Sie der Meinung sind, dass es sich um einen Fehler in BiscuIT " +" Wenn Sie der Meinung sind, dass es sich um einen Fehler in AlekSIS " "handelt, kontaktieren Sie bitte einen Ihrer\n" " Systemadministratoren:\n" " " -#: biscuit/core/templates/404.html:5 +#: aleksis/core/templates/404.html:5 msgid "Not found" msgstr "Nicht gefunden" -#: biscuit/core/templates/404.html:12 +#: aleksis/core/templates/404.html:12 msgid "The requested page or object was not found." msgstr "Die angefragte Seite oder das angefragte Objekt wurde nicht gefunden." -#: biscuit/core/templates/404.html:16 +#: aleksis/core/templates/404.html:16 msgid "" "\n" " If you were redirected by a link on an external page,\n" @@ -286,11 +285,11 @@ msgstr "" "ist es möglich, dass dieser veraltet war.\n" " " -#: biscuit/core/templates/500.html:5 +#: aleksis/core/templates/500.html:5 msgid "Internal Server Error" msgstr "Interner Serverfehler" -#: biscuit/core/templates/500.html:12 +#: aleksis/core/templates/500.html:12 msgid "" "\n" " An unexpected error has occured.\n" @@ -300,7 +299,7 @@ msgstr "" " Ein unerwarteter Fehler ist aufgetreten.\n" " " -#: biscuit/core/templates/500.html:18 +#: aleksis/core/templates/500.html:18 msgid "" "\n" " Your site administrators will automatically be notified about this\n" @@ -311,11 +310,11 @@ msgstr "" " Ihre Administratoren werden automatisch über diesen Fehler informiert.\n" " " -#: biscuit/core/templates/503.html:5 +#: aleksis/core/templates/503.html:5 msgid "Maintenance mode" msgstr "Wartungsmodus" -#: biscuit/core/templates/503.html:12 +#: aleksis/core/templates/503.html:12 msgid "" "\n" " The maintenance mode is currently enabled. Please try again later.\n" @@ -326,45 +325,45 @@ msgstr "" "erneut.\n" " " -#: biscuit/core/templates/core/base.html:47 +#: aleksis/core/templates/core/base.html:47 msgid "Logged in as" msgstr "" -#: biscuit/core/templates/core/edit_group.html:16 -#: biscuit/core/templates/core/edit_group.html:18 +#: aleksis/core/templates/core/edit_group.html:16 +#: aleksis/core/templates/core/edit_group.html:18 msgid "Edit group" msgstr "Gruppe editieren" -#: biscuit/core/templates/core/edit_person.html:7 -#: biscuit/core/templates/core/edit_person.html:9 +#: aleksis/core/templates/core/edit_person.html:7 +#: aleksis/core/templates/core/edit_person.html:9 msgid "Edit person" msgstr "Person editieren" -#: biscuit/core/templates/core/edit_school.html:8 +#: aleksis/core/templates/core/edit_school.html:8 msgid "Edit school" msgstr "Schule bearbeiten" -#: biscuit/core/templates/core/group_full.html:8 +#: aleksis/core/templates/core/group_full.html:8 msgid "Group" msgstr "Gruppe" -#: biscuit/core/templates/core/group_full.html:19 +#: aleksis/core/templates/core/group_full.html:19 msgid "Details" msgstr "Details" -#: biscuit/core/templates/core/group_full.html:28 +#: aleksis/core/templates/core/group_full.html:28 msgid "Owners" msgstr "Leiter/-innen" -#: biscuit/core/templates/core/group_full.html:31 +#: aleksis/core/templates/core/group_full.html:31 msgid "Members" msgstr "Mitglieder" -#: biscuit/core/templates/core/group_full.html:35 +#: aleksis/core/templates/core/group_full.html:35 msgid "Group not found" msgstr "Gruppe nicht gefunden" -#: biscuit/core/templates/core/group_full.html:38 +#: aleksis/core/templates/core/group_full.html:38 msgid "" "\n" " There is no group with this id.\n" @@ -374,44 +373,44 @@ msgstr "" " Es existiert keine Gruppe mit dieser ID.\n" " " -#: biscuit/core/templates/core/index.html:8 +#: aleksis/core/templates/core/index.html:8 msgid "" "\n" -" BiscuIT School Information System (SIS)\n" +" AlekSIS (School Information System)\n" " " msgstr "" "\n" -" BiscuIT Schulinformationssystem (SIS)\n" +" AlekSIS (Schulinformationssystem)\n" " " -#: biscuit/core/templates/core/index.html:16 +#: aleksis/core/templates/core/index.html:16 msgid "" "\n" -" BiscuIT is a web-based school information system (SIS) which can be " +" AlekSIS is a web-based school information system (SIS) which can be " "used to\n" " manage and/or publish organisational data of educational " "institutions.\n" " " msgstr "" "\n" -" BiscuIT ist ein webbasiertes Schul-Informations-System (SIS), das " +" AlekSIS ist ein webbasiertes Schul-Informations-System (SIS), das " "verwendet werden kann, um organisatorische Daten von Bildungseinrichten zu " "verwalten oder zu publizieren.\n" " " -#: biscuit/core/templates/core/no_person.html:11 +#: aleksis/core/templates/core/no_person.html:11 #, fuzzy #| msgid "" #| "\n" #| " Your user account is not linked to a person. This means you\n" #| " cannot access any school-related information. Please contact\n" -#| " the managers of BiscuIT at your school.\n" +#| " the managers of AlekSIS at your school.\n" #| " " msgid "" "\n" " Your user account is not linked to a person. This means you\n" " cannot access any school-related information. Please contact\n" -" the managers of BiscuIT at your school.\n" +" the managers of AlekSIS at your school.\n" " " msgstr "" "\n" @@ -419,23 +418,23 @@ msgstr "" "bedeutet, dass Sie\n" " keine schulbezogenen Informationen aufrufen können. Bitte wenden Sie " "sich an\n" -" die Verwaltenden von BiscuIT an Ihrer Schule.\n" +" die Verwaltenden von AlekSIS an Ihrer Schule.\n" " " -#: biscuit/core/templates/core/person_full.html:8 -#: biscuit/core/templates/core/persons_accounts.html:41 +#: aleksis/core/templates/core/person_full.html:8 +#: aleksis/core/templates/core/persons_accounts.html:41 msgid "Person" msgstr "Person" -#: biscuit/core/templates/core/person_full.html:19 +#: aleksis/core/templates/core/person_full.html:19 msgid "Contact details" msgstr "Kontaktdetails" -#: biscuit/core/templates/core/person_full.html:70 +#: aleksis/core/templates/core/person_full.html:70 msgid "Person not found" msgstr "Person nicht gefunden" -#: biscuit/core/templates/core/person_full.html:73 +#: aleksis/core/templates/core/person_full.html:73 msgid "" "\n" " There is no person with this id.\n" @@ -445,12 +444,12 @@ msgstr "" " Es existiert keine Person mit dieser ID.\n" " " -#: biscuit/core/templates/core/persons_accounts.html:17 -#: biscuit/core/templates/core/persons_accounts.html:20 +#: aleksis/core/templates/core/persons_accounts.html:17 +#: aleksis/core/templates/core/persons_accounts.html:20 msgid "Link persons to accounts" msgstr "Personen mit Benutzerkonten verknüpfen" -#: biscuit/core/templates/core/persons_accounts.html:26 +#: aleksis/core/templates/core/persons_accounts.html:26 msgid "" "\n" " You can use this form to assign user accounts to persons. Use the\n" @@ -469,35 +468,35 @@ msgstr "" " eingegebenen Benutzernamen und kopiert alle anderen Daten der Person.\n" " " -#: biscuit/core/templates/core/persons_accounts.html:42 +#: aleksis/core/templates/core/persons_accounts.html:42 msgid "Existing account" msgstr "Existierendes Konto" -#: biscuit/core/templates/core/persons_accounts.html:43 +#: aleksis/core/templates/core/persons_accounts.html:43 msgid "New account" msgstr "Neues Konto" -#: biscuit/core/templates/core/persons_accounts.html:59 +#: aleksis/core/templates/core/persons_accounts.html:59 msgid "Update" msgstr "Aktualisieren" -#: biscuit/core/templates/core/save_button.html:3 +#: aleksis/core/templates/core/save_button.html:3 msgid "Save" msgstr "" -#: biscuit/core/templates/core/school_management.html:6 +#: aleksis/core/templates/core/school_management.html:6 msgid "School management" msgstr "Schulverwaltung" -#: biscuit/core/templates/core/system_status.html:12 +#: aleksis/core/templates/core/system_status.html:12 msgid "System checks" msgstr "Systemprüfungen" -#: biscuit/core/templates/core/system_status.html:21 +#: aleksis/core/templates/core/system_status.html:21 msgid "Maintenance mode enabled" msgstr "Wartungsmodus aktiviert" -#: biscuit/core/templates/core/system_status.html:23 +#: aleksis/core/templates/core/system_status.html:23 #, fuzzy #| msgid "Only admin and visitors from internal IPs can access the site." msgid "" @@ -509,19 +508,19 @@ msgstr "" "Nur Administratoren und Besucher von internen IP-Adressen können die Seite " "aufrufen." -#: biscuit/core/templates/core/system_status.html:34 +#: aleksis/core/templates/core/system_status.html:34 msgid "Maintenance mode disabled" msgstr "Wartungsmodus deaktiviert" -#: biscuit/core/templates/core/system_status.html:35 +#: aleksis/core/templates/core/system_status.html:35 msgid "Everyone can access the site." msgstr "Jeder kann die Seite aufrufen." -#: biscuit/core/templates/core/system_status.html:45 +#: aleksis/core/templates/core/system_status.html:45 msgid "Debug mode enabled" msgstr "Debug-Modus aktiviert" -#: biscuit/core/templates/core/system_status.html:47 +#: aleksis/core/templates/core/system_status.html:47 #, fuzzy #| msgid "" #| "The web server throws back debug information on errors. Do not use in " @@ -535,11 +534,11 @@ msgstr "" "Der Server gibt Debug-Informationen bei Fehlern zurück. Nicht im " "Produktivbetrieb nutzen!" -#: biscuit/core/templates/core/system_status.html:54 +#: aleksis/core/templates/core/system_status.html:54 msgid "Debug mode disabled" msgstr "Debug-Modus deaktivert" -#: biscuit/core/templates/core/system_status.html:56 +#: aleksis/core/templates/core/system_status.html:56 #, fuzzy #| msgid "Debug mode is disabled. Default error pages are displayed on errors." msgid "" @@ -551,33 +550,33 @@ msgstr "" "Debug-Modus ist deaktiviert. Standard-Fehlerseiten werden bei Fehlern " "angezeigt." -#: biscuit/core/templates/core/system_status.html:69 +#: aleksis/core/templates/core/system_status.html:69 msgid "Recent backup cron jobs" msgstr "Letzte Backup-Cron-Jobs" -#: biscuit/core/templates/impersonate/list_users.html:8 +#: aleksis/core/templates/impersonate/list_users.html:8 msgid "Impersonate user" msgstr "Als Benutzer verkleiden" -#: biscuit/core/templates/two_factor/_wizard_actions.html:6 +#: aleksis/core/templates/two_factor/_wizard_actions.html:6 msgid "Cancel" msgstr "" -#: biscuit/core/templates/two_factor/_wizard_actions.html:14 -#: biscuit/core/templates/two_factor/_wizard_actions.html:19 +#: aleksis/core/templates/two_factor/_wizard_actions.html:14 +#: aleksis/core/templates/two_factor/_wizard_actions.html:19 msgid "Back" msgstr "" -#: biscuit/core/templates/two_factor/_wizard_actions.html:24 +#: aleksis/core/templates/two_factor/_wizard_actions.html:24 msgid "Next" msgstr "" -#: biscuit/core/templates/two_factor/core/backup_tokens.html:5 -#: biscuit/core/templates/two_factor/profile/profile.html:42 +#: aleksis/core/templates/two_factor/core/backup_tokens.html:5 +#: aleksis/core/templates/two_factor/profile/profile.html:42 msgid "Backup Tokens" msgstr "" -#: biscuit/core/templates/two_factor/core/backup_tokens.html:10 +#: aleksis/core/templates/two_factor/core/backup_tokens.html:10 msgid "" "\n" " Backup tokens can be used when your primary and backup\n" @@ -590,7 +589,7 @@ msgid "" " " msgstr "" -#: biscuit/core/templates/two_factor/core/backup_tokens.html:29 +#: aleksis/core/templates/two_factor/core/backup_tokens.html:29 #, fuzzy #| msgid "" #| "\n" @@ -605,41 +604,41 @@ msgstr "" " Es existiert keine Person mit dieser ID.\n" " " -#: biscuit/core/templates/two_factor/core/backup_tokens.html:35 +#: aleksis/core/templates/two_factor/core/backup_tokens.html:35 msgid "You don't have any backup codes yet." msgstr "" -#: biscuit/core/templates/two_factor/core/backup_tokens.html:41 +#: aleksis/core/templates/two_factor/core/backup_tokens.html:41 msgid "Back to Account Security" msgstr "" -#: biscuit/core/templates/two_factor/core/backup_tokens.html:45 +#: aleksis/core/templates/two_factor/core/backup_tokens.html:45 msgid "Generate Tokens" msgstr "" -#: biscuit/core/templates/two_factor/core/login.html:13 +#: aleksis/core/templates/two_factor/core/login.html:13 msgid "Enter your credentials." msgstr "" -#: biscuit/core/templates/two_factor/core/login.html:16 +#: aleksis/core/templates/two_factor/core/login.html:16 msgid "" "We are calling your phone right now, please enter the\n" " digits you hear." msgstr "" -#: biscuit/core/templates/two_factor/core/login.html:19 +#: aleksis/core/templates/two_factor/core/login.html:19 msgid "" "We sent you a text message, please enter the tokens we\n" " sent." msgstr "" -#: biscuit/core/templates/two_factor/core/login.html:22 +#: aleksis/core/templates/two_factor/core/login.html:22 msgid "" "Please enter the tokens generated by your token\n" " generator." msgstr "" -#: biscuit/core/templates/two_factor/core/login.html:26 +#: aleksis/core/templates/two_factor/core/login.html:26 msgid "" "Use this form for entering backup tokens for logging in.\n" " These tokens have been generated for you to print and keep safe. " @@ -647,23 +646,23 @@ msgid "" " enter one of these backup tokens to login to your account." msgstr "" -#: biscuit/core/templates/two_factor/core/login.html:42 +#: aleksis/core/templates/two_factor/core/login.html:42 msgid "Or, alternatively, use one of your backup phones:" msgstr "" -#: biscuit/core/templates/two_factor/core/login.html:52 +#: aleksis/core/templates/two_factor/core/login.html:52 msgid "As a last resort, you can use a backup token:" msgstr "" -#: biscuit/core/templates/two_factor/core/login.html:55 +#: aleksis/core/templates/two_factor/core/login.html:55 msgid "Use Backup Token" msgstr "" -#: biscuit/core/templates/two_factor/core/otp_required.html:5 +#: aleksis/core/templates/two_factor/core/otp_required.html:5 msgid "Permission Denied" msgstr "" -#: biscuit/core/templates/two_factor/core/otp_required.html:7 +#: aleksis/core/templates/two_factor/core/otp_required.html:7 msgid "" "The page you requested, enforces users to verify using\n" " two-factor authentication for security reasons. You need to enable " @@ -671,42 +670,42 @@ msgid "" " security features in order to access this page." msgstr "" -#: biscuit/core/templates/two_factor/core/otp_required.html:11 +#: aleksis/core/templates/two_factor/core/otp_required.html:11 msgid "" "Two-factor authentication is not enabled for your\n" " account. Enable two-factor authentication for enhanced account\n" " security." msgstr "" -#: biscuit/core/templates/two_factor/core/otp_required.html:16 +#: aleksis/core/templates/two_factor/core/otp_required.html:16 msgid "Go back" msgstr "" -#: biscuit/core/templates/two_factor/core/otp_required.html:18 -#: biscuit/core/templates/two_factor/core/setup.html:5 -#: biscuit/core/templates/two_factor/core/setup_complete.html:5 -#: biscuit/core/templates/two_factor/profile/profile.html:82 +#: aleksis/core/templates/two_factor/core/otp_required.html:18 +#: aleksis/core/templates/two_factor/core/setup.html:5 +#: aleksis/core/templates/two_factor/core/setup_complete.html:5 +#: aleksis/core/templates/two_factor/profile/profile.html:82 msgid "Enable Two-Factor Authentication" msgstr "" -#: biscuit/core/templates/two_factor/core/phone_register.html:5 +#: aleksis/core/templates/two_factor/core/phone_register.html:5 msgid "Add Backup Phone" msgstr "" -#: biscuit/core/templates/two_factor/core/phone_register.html:8 +#: aleksis/core/templates/two_factor/core/phone_register.html:8 msgid "" "You'll be adding a backup phone number to your\n" " account. This number will be used if your primary method of\n" " registration is not available." msgstr "" -#: biscuit/core/templates/two_factor/core/phone_register.html:12 +#: aleksis/core/templates/two_factor/core/phone_register.html:12 msgid "" "We've sent a token to your phone number. Please\n" " enter the token you've received." msgstr "" -#: biscuit/core/templates/two_factor/core/setup.html:8 +#: aleksis/core/templates/two_factor/core/setup.html:8 msgid "" "\n" " You are about to take your account security to the\n" @@ -715,14 +714,14 @@ msgid "" " " msgstr "" -#: biscuit/core/templates/two_factor/core/setup.html:16 +#: aleksis/core/templates/two_factor/core/setup.html:16 msgid "" "\n" " Please select which authentication method you would like to use.\n" " " msgstr "" -#: biscuit/core/templates/two_factor/core/setup.html:22 +#: aleksis/core/templates/two_factor/core/setup.html:22 msgid "" "\n" " To start using a token generator, please use your\n" @@ -731,7 +730,7 @@ msgid "" " " msgstr "" -#: biscuit/core/templates/two_factor/core/setup.html:33 +#: aleksis/core/templates/two_factor/core/setup.html:33 msgid "" "\n" " Please enter the phone number you wish to receive the\n" @@ -739,7 +738,7 @@ msgid "" " " msgstr "" -#: biscuit/core/templates/two_factor/core/setup.html:40 +#: aleksis/core/templates/two_factor/core/setup.html:40 msgid "" "\n" " Please enter the phone number you wish to be called on.\n" @@ -747,7 +746,7 @@ msgid "" " " msgstr "" -#: biscuit/core/templates/two_factor/core/setup.html:49 +#: aleksis/core/templates/two_factor/core/setup.html:49 msgid "" "\n" " We are calling your phone right now, please enter the digits you " @@ -755,14 +754,14 @@ msgid "" " " msgstr "" -#: biscuit/core/templates/two_factor/core/setup.html:55 +#: aleksis/core/templates/two_factor/core/setup.html:55 msgid "" "\n" " We sent you a text message, please enter the tokens we sent.\n" " " msgstr "" -#: biscuit/core/templates/two_factor/core/setup.html:62 +#: aleksis/core/templates/two_factor/core/setup.html:62 msgid "" "\n" " We've encountered an issue with the selected authentication " @@ -775,7 +774,7 @@ msgid "" " " msgstr "" -#: biscuit/core/templates/two_factor/core/setup.html:72 +#: aleksis/core/templates/two_factor/core/setup.html:72 msgid "" "\n" " To identify and verify your YubiKey, please insert a\n" @@ -784,7 +783,7 @@ msgid "" " " msgstr "" -#: biscuit/core/templates/two_factor/core/setup_complete.html:10 +#: aleksis/core/templates/two_factor/core/setup_complete.html:10 msgid "" "\n" " Congratulations, you've successfully enabled two-factor " @@ -792,19 +791,19 @@ msgid "" " " msgstr "" -#: biscuit/core/templates/two_factor/core/setup_complete.html:20 -#: biscuit/core/templates/two_factor/core/setup_complete.html:40 +#: aleksis/core/templates/two_factor/core/setup_complete.html:20 +#: aleksis/core/templates/two_factor/core/setup_complete.html:40 msgid "Back to Profile" msgstr "" -#: biscuit/core/templates/two_factor/core/setup_complete.html:24 -#: biscuit/core/templates/two_factor/core/setup_complete.html:44 +#: aleksis/core/templates/two_factor/core/setup_complete.html:24 +#: aleksis/core/templates/two_factor/core/setup_complete.html:44 #, fuzzy #| msgid "Recent backup cron jobs" msgid "Generate backup codes" msgstr "Letzte Backup-Cron-Jobs" -#: biscuit/core/templates/two_factor/core/setup_complete.html:30 +#: aleksis/core/templates/two_factor/core/setup_complete.html:30 msgid "" "\n" " However, it might happen that you don't have access to\n" @@ -814,51 +813,51 @@ msgid "" " " msgstr "" -#: biscuit/core/templates/two_factor/core/setup_complete.html:48 -#: biscuit/core/templates/two_factor/profile/profile.html:37 +#: aleksis/core/templates/two_factor/core/setup_complete.html:48 +#: aleksis/core/templates/two_factor/profile/profile.html:37 msgid "Add Phone Number" msgstr "" -#: biscuit/core/templates/two_factor/profile/profile.html:6 +#: aleksis/core/templates/two_factor/profile/profile.html:6 #, fuzzy #| msgid "Account" msgid "Account Security" msgstr "Konto" -#: biscuit/core/templates/two_factor/profile/profile.html:11 +#: aleksis/core/templates/two_factor/profile/profile.html:11 msgid "Tokens will be generated by your token generator." msgstr "" -#: biscuit/core/templates/two_factor/profile/profile.html:13 +#: aleksis/core/templates/two_factor/profile/profile.html:13 #, python-format msgid "Primary method: %(primary)s" msgstr "" -#: biscuit/core/templates/two_factor/profile/profile.html:15 +#: aleksis/core/templates/two_factor/profile/profile.html:15 msgid "Tokens will be generated by your YubiKey." msgstr "" -#: biscuit/core/templates/two_factor/profile/profile.html:19 +#: aleksis/core/templates/two_factor/profile/profile.html:19 msgid "Backup Phone Numbers" msgstr "" -#: biscuit/core/templates/two_factor/profile/profile.html:20 +#: aleksis/core/templates/two_factor/profile/profile.html:20 msgid "" "If your primary method is not available, we are able to\n" " send backup tokens to the phone numbers listed below." msgstr "" -#: biscuit/core/templates/two_factor/profile/profile.html:29 +#: aleksis/core/templates/two_factor/profile/profile.html:29 msgid "Unregister" msgstr "" -#: biscuit/core/templates/two_factor/profile/profile.html:44 +#: aleksis/core/templates/two_factor/profile/profile.html:44 msgid "" "If you don't have any device with you, you can access\n" " your account using backup tokens." msgstr "" -#: biscuit/core/templates/two_factor/profile/profile.html:46 +#: aleksis/core/templates/two_factor/profile/profile.html:46 #, fuzzy, python-format #| msgid "" #| "\n" @@ -881,16 +880,16 @@ msgstr[1] "" " Sie sind nicht mit einer Person verknüpft\n" " " -#: biscuit/core/templates/two_factor/profile/profile.html:55 +#: aleksis/core/templates/two_factor/profile/profile.html:55 msgid "Show Codes" msgstr "" -#: biscuit/core/templates/two_factor/profile/profile.html:59 -#: biscuit/core/templates/two_factor/profile/profile.html:69 +#: aleksis/core/templates/two_factor/profile/profile.html:59 +#: aleksis/core/templates/two_factor/profile/profile.html:69 msgid "Disable Two-Factor Authentication" msgstr "" -#: biscuit/core/templates/two_factor/profile/profile.html:61 +#: aleksis/core/templates/two_factor/profile/profile.html:61 msgid "" "\n" " However we strongly discourage you to do so, you can\n" @@ -898,7 +897,7 @@ msgid "" " " msgstr "" -#: biscuit/core/templates/two_factor/profile/profile.html:74 +#: aleksis/core/templates/two_factor/profile/profile.html:74 msgid "" "\n" " Two-factor authentication is not enabled for your\n" @@ -907,24 +906,24 @@ msgid "" " " msgstr "" -#: biscuit/core/views.py:148 +#: aleksis/core/views.py:148 msgid "The person has been saved." msgstr "Die Person wurde gespeichert." -#: biscuit/core/views.py:171 +#: aleksis/core/views.py:171 msgid "The group has been saved." msgstr "Die Gruppe wurde gespeichert." -#: biscuit/core/views.py:216 +#: aleksis/core/views.py:216 msgid "The school has been saved." msgstr "Die Schule wurde gespeichert." -#: biscuit/core/views.py:235 +#: aleksis/core/views.py:235 msgid "The term has been saved." msgstr "Das Schuljahr wurde gespeichert." -#~ msgid "BiscuIT Software" -#~ msgstr "BiscuIT-Software" +#~ msgid "AlekSIS Software" +#~ msgstr "AlekSIS-Software" #~ msgid "Support" #~ msgstr "Unterstützung" diff --git a/biscuit/core/locale/fr/LC_MESSAGES/django.po b/aleksis/core/locale/fr/LC_MESSAGES/django.po similarity index 96% rename from biscuit/core/locale/fr/LC_MESSAGES/django.po rename to aleksis/core/locale/fr/LC_MESSAGES/django.po index 188fe9225dda4fd3902d69e648bb87cb2af46256..773da185f0b03c5ca21f2819cd0cd0fb72c6bf04 100644 --- a/biscuit/core/locale/fr/LC_MESSAGES/django.po +++ b/aleksis/core/locale/fr/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: AlekSIS (School Information System) 0.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-23 10:06+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" @@ -90,7 +90,7 @@ msgid "Persons and accounts" msgstr "" #: menus.py:80 -msgid "BiscuIT Software" +msgid "AlekSIS Software" msgstr "" #: menus.py:84 @@ -257,7 +257,7 @@ msgstr "" #: templates/403.html:16 templates/404.html:20 msgid "" "\n" -" If you think this is an error in BiscuIT, please contact your site\n" +" If you think this is an error in AlekSIS, please contact your site\n" " administrators.\n" " " msgstr "" @@ -372,14 +372,14 @@ msgstr "" #: templates/core/index.html:8 msgid "" "\n" -" BiscuIT School Information System (SIS)\n" +" AlekSIS (School Information System)\n" " " msgstr "" #: templates/core/index.html:16 msgid "" "\n" -" BiscuIT is a web-based school information system (SIS) which can be " +" AlekSIS is a web-based school information system (SIS) which can be " "used to\n" " manage and/or publish organisational data of educational " "institutions.\n" @@ -402,7 +402,7 @@ msgid "" "\n" " Your user account is not linked to a person. This means you\n" " cannot access any school-related information. Please contact\n" -" the managers of BiscuIT at your school.\n" +" the managers of AlekSIS at your school.\n" " " msgstr "" diff --git a/biscuit/core/locale/tr_TR/LC_MESSAGES/django.po b/aleksis/core/locale/nb_NO/LC_MESSAGES/django.po similarity index 96% rename from biscuit/core/locale/tr_TR/LC_MESSAGES/django.po rename to aleksis/core/locale/nb_NO/LC_MESSAGES/django.po index 08ffe984beaf3bb947c104eee57f59988578e8aa..69bb82a70bf5f966a3713a451cee8f554f48cacf 100644 --- a/biscuit/core/locale/tr_TR/LC_MESSAGES/django.po +++ b/aleksis/core/locale/nb_NO/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: AlekSIS (School Information System) 0.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-23 10:06+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" @@ -89,7 +89,7 @@ msgid "Persons and accounts" msgstr "" #: menus.py:80 -msgid "BiscuIT Software" +msgid "AlekSIS Software" msgstr "" #: menus.py:84 @@ -256,7 +256,7 @@ msgstr "" #: templates/403.html:16 templates/404.html:20 msgid "" "\n" -" If you think this is an error in BiscuIT, please contact your site\n" +" If you think this is an error in AlekSIS, please contact your site\n" " administrators.\n" " " msgstr "" @@ -371,14 +371,14 @@ msgstr "" #: templates/core/index.html:8 msgid "" "\n" -" BiscuIT School Information System (SIS)\n" +" AlekSIS (School Information System)\n" " " msgstr "" #: templates/core/index.html:16 msgid "" "\n" -" BiscuIT is a web-based school information system (SIS) which can be " +" AlekSIS is a web-based school information system (SIS) which can be " "used to\n" " manage and/or publish organisational data of educational " "institutions.\n" @@ -401,7 +401,7 @@ msgid "" "\n" " Your user account is not linked to a person. This means you\n" " cannot access any school-related information. Please contact\n" -" the managers of BiscuIT at your school.\n" +" the managers of AlekSIS at your school.\n" " " msgstr "" diff --git a/biscuit/core/locale/nb_NO/LC_MESSAGES/django.po b/aleksis/core/locale/tr_TR/LC_MESSAGES/django.po similarity index 96% rename from biscuit/core/locale/nb_NO/LC_MESSAGES/django.po rename to aleksis/core/locale/tr_TR/LC_MESSAGES/django.po index 08ffe984beaf3bb947c104eee57f59988578e8aa..69bb82a70bf5f966a3713a451cee8f554f48cacf 100644 --- a/biscuit/core/locale/nb_NO/LC_MESSAGES/django.po +++ b/aleksis/core/locale/tr_TR/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: AlekSIS (School Information System) 0.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-23 10:06+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" @@ -89,7 +89,7 @@ msgid "Persons and accounts" msgstr "" #: menus.py:80 -msgid "BiscuIT Software" +msgid "AlekSIS Software" msgstr "" #: menus.py:84 @@ -256,7 +256,7 @@ msgstr "" #: templates/403.html:16 templates/404.html:20 msgid "" "\n" -" If you think this is an error in BiscuIT, please contact your site\n" +" If you think this is an error in AlekSIS, please contact your site\n" " administrators.\n" " " msgstr "" @@ -371,14 +371,14 @@ msgstr "" #: templates/core/index.html:8 msgid "" "\n" -" BiscuIT School Information System (SIS)\n" +" AlekSIS (School Information System)\n" " " msgstr "" #: templates/core/index.html:16 msgid "" "\n" -" BiscuIT is a web-based school information system (SIS) which can be " +" AlekSIS is a web-based school information system (SIS) which can be " "used to\n" " manage and/or publish organisational data of educational " "institutions.\n" @@ -401,7 +401,7 @@ msgid "" "\n" " Your user account is not linked to a person. This means you\n" " cannot access any school-related information. Please contact\n" -" the managers of BiscuIT at your school.\n" +" the managers of AlekSIS at your school.\n" " " msgstr "" diff --git a/biscuit/core/mailer.py b/aleksis/core/mailer.py similarity index 100% rename from biscuit/core/mailer.py rename to aleksis/core/mailer.py diff --git a/biscuit/core/menus.py b/aleksis/core/menus.py similarity index 96% rename from biscuit/core/menus.py rename to aleksis/core/menus.py index 016af45b8b5bceb139dc8b06aae54c40c6e78220..c4ba24e2ab87e783a358721d90028e0a8c77b96a 100644 --- a/biscuit/core/menus.py +++ b/aleksis/core/menus.py @@ -22,7 +22,7 @@ MENUS = { "icon": "stop", "validators": [ "menu_generator.validators.is_authenticated", - "biscuit.core.util.core_helpers.is_impersonate", + "aleksis.core.util.core_helpers.is_impersonate", ], }, { @@ -104,7 +104,7 @@ MENUS = { "root": True, "validators": [ "menu_generator.validators.is_authenticated", - "biscuit.core.util.core_helpers.has_person", + "aleksis.core.util.core_helpers.has_person", ], "submenu": [ { @@ -129,7 +129,7 @@ MENUS = { }, ], "FOOTER_MENU_CORE": [ - {"name": _("Website"), "url": "https://biscuit.edugit.org/"}, + {"name": _("Website"), "url": "https://aleksis.edugit.org/"}, {"name": "Teckids e.V.", "url": "https://www.teckids.org/"}, ], "DATA_MANAGEMENT_MENU": [], diff --git a/biscuit/core/meta.py b/aleksis/core/meta.py similarity index 100% rename from biscuit/core/meta.py rename to aleksis/core/meta.py diff --git a/biscuit/core/migrations/__init__.py b/aleksis/core/migrations/__init__.py similarity index 100% rename from biscuit/core/migrations/__init__.py rename to aleksis/core/migrations/__init__.py diff --git a/biscuit/core/mixins.py b/aleksis/core/mixins.py similarity index 93% rename from biscuit/core/mixins.py rename to aleksis/core/mixins.py index 6db9ffe40229c36ffb51292925cfe62ad10f2408..ad159fed2bfb603b8d408df070e16fca3519479f 100644 --- a/biscuit/core/mixins.py +++ b/aleksis/core/mixins.py @@ -8,7 +8,7 @@ from easyaudit.models import CRUDEvent class ExtensibleModel(object): - """ Allow injection of code from BiscuIT apps to extend model functionality. + """ Allow injection of code from AlekSIS apps to extend model functionality. After all apps have been loaded, the code in the `model_extensions` module in every app is executed. All code that shall be injected into a model goes there. @@ -19,7 +19,7 @@ class ExtensibleModel(object): from datetime import date, timedelta - from biscuit.core.models import Person + from aleksis.core.models import Person @Person.property def is_cool(self) -> bool: @@ -29,8 +29,8 @@ class ExtensibleModel(object): def age(self) -> timedelta: return self.date_of_birth - date.today() - For a more advanced example, using features from the ORM, see BiscuIT-App-Chronos - and BiscuIT-App-Alsijil. + For a more advanced example, using features from the ORM, see AlekSIS-App-Chronos + and AlekSIS-App-Alsijil. :Date: 2019-11-07 :Authors: diff --git a/biscuit/core/models.py b/aleksis/core/models.py similarity index 98% rename from biscuit/core/models.py rename to aleksis/core/models.py index aeb7131562a2c1978bd85966ae92dec543730280..9bcebd492e5d3f85458c3cdce4d2d9a128ff2786 100644 --- a/biscuit/core/models.py +++ b/aleksis/core/models.py @@ -21,7 +21,7 @@ theme_settings = ThemeSettings("Global theme settings") class School(models.Model): """A school that will have many other objects linked to it. - BiscuIT has multi-tenant support by linking all objects to a school, + AlekSIS has multi-tenant support by linking all objects to a school, and limiting all features to objects related to the same school as the currently logged-in user. """ diff --git a/biscuit/core/schoolapps/settings.py b/aleksis/core/schoolapps/settings.py similarity index 100% rename from biscuit/core/schoolapps/settings.py rename to aleksis/core/schoolapps/settings.py diff --git a/biscuit/core/schoolapps/urls.py b/aleksis/core/schoolapps/urls.py similarity index 100% rename from biscuit/core/schoolapps/urls.py rename to aleksis/core/schoolapps/urls.py diff --git a/biscuit/core/settings.py b/aleksis/core/settings.py similarity index 95% rename from biscuit/core/settings.py rename to aleksis/core/settings.py index ba183e461853eba7e767992ace1efc1c67d94b1d..55f09f24db5d70baba3d678f59773f41209a4448 100644 --- a/biscuit/core/settings.py +++ b/aleksis/core/settings.py @@ -9,8 +9,8 @@ from easy_thumbnails.conf import Settings as thumbnail_settings from .util.core_helpers import get_app_packages -ENVVAR_PREFIX_FOR_DYNACONF = "BISCUIT" -DIRS_FOR_DYNACONF = ["/etc/biscuit"] +ENVVAR_PREFIX_FOR_DYNACONF = "ALEKSIS" +DIRS_FOR_DYNACONF = ["/etc/aleksis"] SETTINGS_FILE_FOR_DYNACONF = [] for directory in DIRS_FOR_DYNACONF: @@ -36,7 +36,7 @@ DEBUG_TOOLBAR_CONFIG = { "RENDER_PANELS": True, "SHOW_COLLAPSED": True, "JQUERY_URL": "", - "SHOW_TOOLBAR_CALLBACK": "biscuit.core.util.core_helpers.dt_show_toolbar", + "SHOW_TOOLBAR_CALLBACK": "aleksis.core.util.core_helpers.dt_show_toolbar", } ALLOWED_HOSTS = _settings.get("http.allowed_hosts", []) @@ -69,7 +69,7 @@ INSTALLED_APPS = [ "django_otp.plugins.otp_static", "django_otp", "otp_yubikey", - "biscuit.core", + "aleksis.core", "impersonate", "two_factor", "material" @@ -104,7 +104,7 @@ MIDDLEWARE = [ # 'django.middleware.cache.FetchFromCacheMiddleware' ] -ROOT_URLCONF = "biscuit.core.urls" +ROOT_URLCONF = "aleksis.core.urls" TEMPLATES = [ { @@ -131,7 +131,7 @@ THUMBNAIL_PROCESSORS = ( # Already included by base template / Bootstrap IMAGE_CROPPING_JQUERY_URL = None -WSGI_APPLICATION = "biscuit.core.wsgi.application" +WSGI_APPLICATION = "aleksis.core.wsgi.application" # Database @@ -140,8 +140,8 @@ WSGI_APPLICATION = "biscuit.core.wsgi.application" DATABASES = { "default": { "ENGINE": "django.db.backends.postgresql", - "NAME": _settings.get("database.name", "biscuit"), - "USER": _settings.get("database.username", "biscuit"), + "NAME": _settings.get("database.name", "aleksis"), + "USER": _settings.get("database.username", "aleksis"), "PASSWORD": _settings.get("database.password", None), "HOST": _settings.get("database.host", "127.0.0.1"), "PORT": _settings.get("database.port", "5432"), @@ -248,8 +248,8 @@ ANY_JS = { SASS_PROCESSOR_AUTO_INCLUDE = False SASS_PROCESSOR_CUSTOM_FUNCTIONS = { - "get-colour": "biscuit.core.util.sass_helpers.get_colour", - "get-theme-setting": "biscuit.core.util.sass_helpers.get_theme_setting", + "get-colour": "aleksis.core.util.sass_helpers.get_colour", + "get-theme-setting": "aleksis.core.util.sass_helpers.get_theme_setting", } SASS_PROCESSOR_INCLUDE_DIRS = [_settings.get("materialize.sass_path", JS_ROOT + "/materialize-css/sass/"), STATIC_ROOT] diff --git a/biscuit/core/signals.py b/aleksis/core/signals.py similarity index 100% rename from biscuit/core/signals.py rename to aleksis/core/signals.py diff --git a/biscuit/core/static/common/favicon.ico b/aleksis/core/static/common/favicon.ico similarity index 100% rename from biscuit/core/static/common/favicon.ico rename to aleksis/core/static/common/favicon.ico diff --git a/biscuit/core/static/common/helper.js b/aleksis/core/static/common/helper.js similarity index 100% rename from biscuit/core/static/common/helper.js rename to aleksis/core/static/common/helper.js diff --git a/biscuit/core/static/common/logo.png b/aleksis/core/static/common/logo.png similarity index 100% rename from biscuit/core/static/common/logo.png rename to aleksis/core/static/common/logo.png diff --git a/biscuit/core/static/common/serviceworker.js b/aleksis/core/static/common/serviceworker.js similarity index 100% rename from biscuit/core/static/common/serviceworker.js rename to aleksis/core/static/common/serviceworker.js diff --git a/biscuit/core/static/icons/android_192.png b/aleksis/core/static/icons/android_192.png similarity index 100% rename from biscuit/core/static/icons/android_192.png rename to aleksis/core/static/icons/android_192.png diff --git a/biscuit/core/static/icons/android_512.png b/aleksis/core/static/icons/android_512.png similarity index 100% rename from biscuit/core/static/icons/android_512.png rename to aleksis/core/static/icons/android_512.png diff --git a/biscuit/core/static/icons/apple_114.png b/aleksis/core/static/icons/apple_114.png similarity index 100% rename from biscuit/core/static/icons/apple_114.png rename to aleksis/core/static/icons/apple_114.png diff --git a/biscuit/core/static/icons/apple_152.png b/aleksis/core/static/icons/apple_152.png similarity index 100% rename from biscuit/core/static/icons/apple_152.png rename to aleksis/core/static/icons/apple_152.png diff --git a/biscuit/core/static/icons/apple_180.png b/aleksis/core/static/icons/apple_180.png similarity index 100% rename from biscuit/core/static/icons/apple_180.png rename to aleksis/core/static/icons/apple_180.png diff --git a/biscuit/core/static/icons/apple_76.png b/aleksis/core/static/icons/apple_76.png similarity index 100% rename from biscuit/core/static/icons/apple_76.png rename to aleksis/core/static/icons/apple_76.png diff --git a/biscuit/core/static/icons/favicon_16.png b/aleksis/core/static/icons/favicon_16.png similarity index 100% rename from biscuit/core/static/icons/favicon_16.png rename to aleksis/core/static/icons/favicon_16.png diff --git a/biscuit/core/static/icons/favicon_32.png b/aleksis/core/static/icons/favicon_32.png similarity index 100% rename from biscuit/core/static/icons/favicon_32.png rename to aleksis/core/static/icons/favicon_32.png diff --git a/biscuit/core/static/icons/favicon_48.png b/aleksis/core/static/icons/favicon_48.png similarity index 100% rename from biscuit/core/static/icons/favicon_48.png rename to aleksis/core/static/icons/favicon_48.png diff --git a/biscuit/core/static/img/biscuit-logo.png b/aleksis/core/static/img/aleksis-logo.png similarity index 100% rename from biscuit/core/static/img/biscuit-logo.png rename to aleksis/core/static/img/aleksis-logo.png diff --git a/biscuit/core/static/img/biscuit-logo.svg b/aleksis/core/static/img/aleksis-logo.svg similarity index 99% rename from biscuit/core/static/img/biscuit-logo.svg rename to aleksis/core/static/img/aleksis-logo.svg index b728e703e35dcad9ced63232afa35d8e19c6a576..a01842b83e398d2e02b3d723747bfe1524ad970e 100644 --- a/biscuit/core/static/img/biscuit-logo.svg +++ b/aleksis/core/static/img/aleksis-logo.svg @@ -15,8 +15,8 @@ version="1.1" id="svg144" inkscape:version="0.92.4 (5da689c313, 2019-01-14)" - sodipodi:docname="biscuit-logo.svg" - inkscape:export-filename="/home/nik/Teckids/BiscuIT/BiscuIT-ng/biscuit/core/static/img/biscuit-logo.png" + sodipodi:docname="aleksis-logo.svg" + inkscape:export-filename="/home/nik/Teckids/AlekSIS/AlekSIS/aleksis/core/static/img/aleksis-logo.png" inkscape:export-xdpi="66.690002" inkscape:export-ydpi="66.690002"> <defs diff --git a/biscuit/core/static/img/fallback.png b/aleksis/core/static/img/fallback.png similarity index 100% rename from biscuit/core/static/img/fallback.png rename to aleksis/core/static/img/fallback.png diff --git a/biscuit/core/static/js/main.js b/aleksis/core/static/js/main.js similarity index 100% rename from biscuit/core/static/js/main.js rename to aleksis/core/static/js/main.js diff --git a/biscuit/core/static/materialize.scss b/aleksis/core/static/materialize.scss similarity index 100% rename from biscuit/core/static/materialize.scss rename to aleksis/core/static/materialize.scss diff --git a/biscuit/core/static/style.scss b/aleksis/core/static/style.scss similarity index 100% rename from biscuit/core/static/style.scss rename to aleksis/core/static/style.scss diff --git a/biscuit/core/static/theme.scss b/aleksis/core/static/theme.scss similarity index 100% rename from biscuit/core/static/theme.scss rename to aleksis/core/static/theme.scss diff --git a/biscuit/core/tables.py b/aleksis/core/tables.py similarity index 100% rename from biscuit/core/tables.py rename to aleksis/core/tables.py diff --git a/biscuit/core/templates/403.html b/aleksis/core/templates/403.html similarity index 91% rename from biscuit/core/templates/403.html rename to aleksis/core/templates/403.html index b7263e92c88f59910ef659dac44493472f6e8795..85143a2c9309c07f591ea643ad9f0dca9d0338b5 100644 --- a/biscuit/core/templates/403.html +++ b/aleksis/core/templates/403.html @@ -14,7 +14,7 @@ <hr /> <p> {% blocktrans %} - If you think this is an error in BiscuIT, please contact your site + If you think this is an error in AlekSIS, please contact your site administrators. {% endblocktrans %} </p> diff --git a/biscuit/core/templates/404.html b/aleksis/core/templates/404.html similarity index 92% rename from biscuit/core/templates/404.html rename to aleksis/core/templates/404.html index 619ac5978a2167f246aa978327c09dd9f76c6e81..fdf4b4197cf387604b5cf81eb0d57f44a4752dd3 100644 --- a/biscuit/core/templates/404.html +++ b/aleksis/core/templates/404.html @@ -18,7 +18,7 @@ it is possible that that link was outdated. {% endblocktrans %} {% blocktrans %} - If you think this is an error in BiscuIT, please contact your site + If you think this is an error in AlekSIS, please contact your site administrators. {% endblocktrans %} </p> diff --git a/biscuit/core/templates/500.html b/aleksis/core/templates/500.html similarity index 100% rename from biscuit/core/templates/500.html rename to aleksis/core/templates/500.html diff --git a/biscuit/core/templates/503.html b/aleksis/core/templates/503.html similarity index 100% rename from biscuit/core/templates/503.html rename to aleksis/core/templates/503.html diff --git a/biscuit/core/templates/common/404.html b/aleksis/core/templates/common/404.html similarity index 100% rename from biscuit/core/templates/common/404.html rename to aleksis/core/templates/common/404.html diff --git a/biscuit/core/templates/common/about.html b/aleksis/core/templates/common/about.html similarity index 100% rename from biscuit/core/templates/common/about.html rename to aleksis/core/templates/common/about.html diff --git a/biscuit/core/templates/common/offline.html b/aleksis/core/templates/common/offline.html similarity index 100% rename from biscuit/core/templates/common/offline.html rename to aleksis/core/templates/common/offline.html diff --git a/biscuit/core/templates/components/msgbox.html b/aleksis/core/templates/components/msgbox.html similarity index 100% rename from biscuit/core/templates/components/msgbox.html rename to aleksis/core/templates/components/msgbox.html diff --git a/biscuit/core/templates/components/react.html b/aleksis/core/templates/components/react.html similarity index 100% rename from biscuit/core/templates/components/react.html rename to aleksis/core/templates/components/react.html diff --git a/biscuit/core/templates/core/base.html b/aleksis/core/templates/core/base.html similarity index 93% rename from biscuit/core/templates/core/base.html rename to aleksis/core/templates/core/base.html index 5c2083a2012f698834545e9d9c8e9d1da479a6fd..8b6995696b227295c4ebdbeacfa7eabf0330ea3c 100644 --- a/biscuit/core/templates/core/base.html +++ b/aleksis/core/templates/core/base.html @@ -53,7 +53,7 @@ <ul id="slide-out" class="sidenav sidenav-fixed"> <li class="logo"> <a id="logo-container" href="/" class="brand-logo"> - <img src="{% static 'img/biscuit-logo.png' %}" alt="BiscuIT Logo" style="height: 70px; width:auto;"> + <img src="{% static 'img/aleksis-logo.png' %}" alt="AlekSIS Logo" style="height: 70px; width:auto;"> </a> </li> <li class="no-padding"> @@ -102,10 +102,10 @@ <div class="footer-copyright"> <div class="container"> <span class="left"> - <a class="blue-text text-lighten-4" href="https://biscuit.edugit.org/"> - BiscuIT - The Free School Information System + <a class="blue-text text-lighten-4" href="https://aleksis.edugit.org/"> + AlekSIS — The Free School Information System </a> - © The BiscuIT Team @ + © The AlekSIS Team @ <a class="blue-text text-lighten-4" href="https://www.teckids.org"> Teckids e.V. </a> diff --git a/biscuit/core/templates/core/crud_events_ul.html b/aleksis/core/templates/core/crud_events_ul.html similarity index 100% rename from biscuit/core/templates/core/crud_events_ul.html rename to aleksis/core/templates/core/crud_events_ul.html diff --git a/biscuit/core/templates/core/data_management.html b/aleksis/core/templates/core/data_management.html similarity index 100% rename from biscuit/core/templates/core/data_management.html rename to aleksis/core/templates/core/data_management.html diff --git a/biscuit/core/templates/core/edit_group.html b/aleksis/core/templates/core/edit_group.html similarity index 100% rename from biscuit/core/templates/core/edit_group.html rename to aleksis/core/templates/core/edit_group.html diff --git a/biscuit/core/templates/core/edit_person.html b/aleksis/core/templates/core/edit_person.html similarity index 100% rename from biscuit/core/templates/core/edit_person.html rename to aleksis/core/templates/core/edit_person.html diff --git a/biscuit/core/templates/core/edit_school.html b/aleksis/core/templates/core/edit_school.html similarity index 100% rename from biscuit/core/templates/core/edit_school.html rename to aleksis/core/templates/core/edit_school.html diff --git a/biscuit/core/templates/core/edit_schoolterm.html b/aleksis/core/templates/core/edit_schoolterm.html similarity index 100% rename from biscuit/core/templates/core/edit_schoolterm.html rename to aleksis/core/templates/core/edit_schoolterm.html diff --git a/biscuit/core/templates/core/footer-menu.html b/aleksis/core/templates/core/footer-menu.html similarity index 100% rename from biscuit/core/templates/core/footer-menu.html rename to aleksis/core/templates/core/footer-menu.html diff --git a/biscuit/core/templates/core/group_full.html b/aleksis/core/templates/core/group_full.html similarity index 100% rename from biscuit/core/templates/core/group_full.html rename to aleksis/core/templates/core/group_full.html diff --git a/biscuit/core/templates/core/groups.html b/aleksis/core/templates/core/groups.html similarity index 100% rename from biscuit/core/templates/core/groups.html rename to aleksis/core/templates/core/groups.html diff --git a/aleksis/core/templates/core/icons.html b/aleksis/core/templates/core/icons.html new file mode 100644 index 0000000000000000000000000000000000000000..53e98aadd7f53a25431dfc1fa6d72aa9b53617a1 --- /dev/null +++ b/aleksis/core/templates/core/icons.html @@ -0,0 +1,7 @@ +{# -*- engine:django -*- #} + +{% load static %} + +<link rel="shortcut icon" type="image/png" href="{% static 'img/aleksis-logo.png' %}" /> +<link rel="shortcut icon" sizes="196x196" href="{% static 'img/aleksis-logo.png' %}" /> +<link rel="apple-touch-icon" href="{% static 'img/aleksis-logo.png' %}" /> diff --git a/biscuit/core/templates/core/index.html b/aleksis/core/templates/core/index.html similarity index 78% rename from biscuit/core/templates/core/index.html rename to aleksis/core/templates/core/index.html index 244020382bf7e4bd811b6030822f884699153104..5055129bffdcbe45d1e5d22f2a27881ad9006052 100644 --- a/biscuit/core/templates/core/index.html +++ b/aleksis/core/templates/core/index.html @@ -6,7 +6,7 @@ {% block page_title %} {% blocktrans %} - BiscuIT School Information System (SIS) + AlekSIS (School Information System) {% endblocktrans %} {% endblock %} @@ -14,7 +14,7 @@ <div class="flow-text"> <p> {% blocktrans %} - BiscuIT is a web-based school information system (SIS) which can be used to + AlekSIS is a web-based school information system (SIS) which can be used to manage and/or publish organisational data of educational institutions. {% endblocktrans %} </p> diff --git a/biscuit/core/templates/core/language_form.html b/aleksis/core/templates/core/language_form.html similarity index 100% rename from biscuit/core/templates/core/language_form.html rename to aleksis/core/templates/core/language_form.html diff --git a/biscuit/core/templates/core/no_person.html b/aleksis/core/templates/core/no_person.html similarity index 89% rename from biscuit/core/templates/core/no_person.html rename to aleksis/core/templates/core/no_person.html index b35201f70fd787edeeffd4fe77b6f38006b3d388..3f506809af721cda657d6a3681a4bfa8e7138916 100644 --- a/biscuit/core/templates/core/no_person.html +++ b/aleksis/core/templates/core/no_person.html @@ -11,7 +11,7 @@ {% blocktrans %} Your user account is not linked to a person. This means you cannot access any school-related information. Please contact - the managers of BiscuIT at your school. + the managers of AlekSIS at your school. {% endblocktrans %} </p> </div> diff --git a/biscuit/core/templates/core/on_page_menu.html b/aleksis/core/templates/core/on_page_menu.html similarity index 100% rename from biscuit/core/templates/core/on_page_menu.html rename to aleksis/core/templates/core/on_page_menu.html diff --git a/biscuit/core/templates/core/person_full.html b/aleksis/core/templates/core/person_full.html similarity index 100% rename from biscuit/core/templates/core/person_full.html rename to aleksis/core/templates/core/person_full.html diff --git a/biscuit/core/templates/core/persons.html b/aleksis/core/templates/core/persons.html similarity index 100% rename from biscuit/core/templates/core/persons.html rename to aleksis/core/templates/core/persons.html diff --git a/biscuit/core/templates/core/persons_accounts.html b/aleksis/core/templates/core/persons_accounts.html similarity index 100% rename from biscuit/core/templates/core/persons_accounts.html rename to aleksis/core/templates/core/persons_accounts.html diff --git a/biscuit/core/templates/core/save_button.html b/aleksis/core/templates/core/save_button.html similarity index 100% rename from biscuit/core/templates/core/save_button.html rename to aleksis/core/templates/core/save_button.html diff --git a/biscuit/core/templates/core/school_management.html b/aleksis/core/templates/core/school_management.html similarity index 100% rename from biscuit/core/templates/core/school_management.html rename to aleksis/core/templates/core/school_management.html diff --git a/biscuit/core/templates/core/sidenav.html b/aleksis/core/templates/core/sidenav.html similarity index 100% rename from biscuit/core/templates/core/sidenav.html rename to aleksis/core/templates/core/sidenav.html diff --git a/biscuit/core/templates/core/system_status.html b/aleksis/core/templates/core/system_status.html similarity index 100% rename from biscuit/core/templates/core/system_status.html rename to aleksis/core/templates/core/system_status.html diff --git a/biscuit/core/templates/core/turnable.html b/aleksis/core/templates/core/turnable.html similarity index 100% rename from biscuit/core/templates/core/turnable.html rename to aleksis/core/templates/core/turnable.html diff --git a/biscuit/core/templates/impersonate/list_users.html b/aleksis/core/templates/impersonate/list_users.html similarity index 100% rename from biscuit/core/templates/impersonate/list_users.html rename to aleksis/core/templates/impersonate/list_users.html diff --git a/biscuit/core/templates/mail/email.html b/aleksis/core/templates/mail/email.html similarity index 100% rename from biscuit/core/templates/mail/email.html rename to aleksis/core/templates/mail/email.html diff --git a/biscuit/core/templates/mail/email.txt b/aleksis/core/templates/mail/email.txt similarity index 100% rename from biscuit/core/templates/mail/email.txt rename to aleksis/core/templates/mail/email.txt diff --git a/biscuit/core/templates/mail/header.html b/aleksis/core/templates/mail/header.html similarity index 100% rename from biscuit/core/templates/mail/header.html rename to aleksis/core/templates/mail/header.html diff --git a/biscuit/core/templates/mail/notification.html b/aleksis/core/templates/mail/notification.html similarity index 100% rename from biscuit/core/templates/mail/notification.html rename to aleksis/core/templates/mail/notification.html diff --git a/biscuit/core/templates/mail/notification.txt b/aleksis/core/templates/mail/notification.txt similarity index 100% rename from biscuit/core/templates/mail/notification.txt rename to aleksis/core/templates/mail/notification.txt diff --git a/biscuit/core/templates/martor/editor.html b/aleksis/core/templates/martor/editor.html similarity index 100% rename from biscuit/core/templates/martor/editor.html rename to aleksis/core/templates/martor/editor.html diff --git a/biscuit/core/templates/martor/emoji.html b/aleksis/core/templates/martor/emoji.html similarity index 100% rename from biscuit/core/templates/martor/emoji.html rename to aleksis/core/templates/martor/emoji.html diff --git a/biscuit/core/templates/martor/guide.html b/aleksis/core/templates/martor/guide.html similarity index 100% rename from biscuit/core/templates/martor/guide.html rename to aleksis/core/templates/martor/guide.html diff --git a/biscuit/core/templates/martor/toolbar.html b/aleksis/core/templates/martor/toolbar.html similarity index 100% rename from biscuit/core/templates/martor/toolbar.html rename to aleksis/core/templates/martor/toolbar.html diff --git a/biscuit/core/templates/partials/footer.html b/aleksis/core/templates/partials/footer.html similarity index 100% rename from biscuit/core/templates/partials/footer.html rename to aleksis/core/templates/partials/footer.html diff --git a/biscuit/core/templates/partials/header.html b/aleksis/core/templates/partials/header.html similarity index 100% rename from biscuit/core/templates/partials/header.html rename to aleksis/core/templates/partials/header.html diff --git a/biscuit/core/templates/partials/paper/footer.html b/aleksis/core/templates/partials/paper/footer.html similarity index 100% rename from biscuit/core/templates/partials/paper/footer.html rename to aleksis/core/templates/partials/paper/footer.html diff --git a/biscuit/core/templates/partials/paper/header.html b/aleksis/core/templates/partials/paper/header.html similarity index 100% rename from biscuit/core/templates/partials/paper/header.html rename to aleksis/core/templates/partials/paper/header.html diff --git a/biscuit/core/templates/registration/logged_out.html b/aleksis/core/templates/registration/logged_out.html similarity index 100% rename from biscuit/core/templates/registration/logged_out.html rename to aleksis/core/templates/registration/logged_out.html diff --git a/biscuit/core/templates/registration/login.html b/aleksis/core/templates/registration/login.html similarity index 100% rename from biscuit/core/templates/registration/login.html rename to aleksis/core/templates/registration/login.html diff --git a/biscuit/core/templates/two_factor/_base_focus.html b/aleksis/core/templates/two_factor/_base_focus.html similarity index 100% rename from biscuit/core/templates/two_factor/_base_focus.html rename to aleksis/core/templates/two_factor/_base_focus.html diff --git a/biscuit/core/templates/two_factor/_wizard_actions.html b/aleksis/core/templates/two_factor/_wizard_actions.html similarity index 100% rename from biscuit/core/templates/two_factor/_wizard_actions.html rename to aleksis/core/templates/two_factor/_wizard_actions.html diff --git a/biscuit/core/templates/two_factor/_wizard_forms.html b/aleksis/core/templates/two_factor/_wizard_forms.html similarity index 100% rename from biscuit/core/templates/two_factor/_wizard_forms.html rename to aleksis/core/templates/two_factor/_wizard_forms.html diff --git a/biscuit/core/templates/two_factor/core/backup_tokens.html b/aleksis/core/templates/two_factor/core/backup_tokens.html similarity index 100% rename from biscuit/core/templates/two_factor/core/backup_tokens.html rename to aleksis/core/templates/two_factor/core/backup_tokens.html diff --git a/biscuit/core/templates/two_factor/core/login.html b/aleksis/core/templates/two_factor/core/login.html similarity index 100% rename from biscuit/core/templates/two_factor/core/login.html rename to aleksis/core/templates/two_factor/core/login.html diff --git a/biscuit/core/templates/two_factor/core/otp_required.html b/aleksis/core/templates/two_factor/core/otp_required.html similarity index 100% rename from biscuit/core/templates/two_factor/core/otp_required.html rename to aleksis/core/templates/two_factor/core/otp_required.html diff --git a/biscuit/core/templates/two_factor/core/phone_register.html b/aleksis/core/templates/two_factor/core/phone_register.html similarity index 100% rename from biscuit/core/templates/two_factor/core/phone_register.html rename to aleksis/core/templates/two_factor/core/phone_register.html diff --git a/biscuit/core/templates/two_factor/core/setup.html b/aleksis/core/templates/two_factor/core/setup.html similarity index 100% rename from biscuit/core/templates/two_factor/core/setup.html rename to aleksis/core/templates/two_factor/core/setup.html diff --git a/biscuit/core/templates/two_factor/core/setup_complete.html b/aleksis/core/templates/two_factor/core/setup_complete.html similarity index 100% rename from biscuit/core/templates/two_factor/core/setup_complete.html rename to aleksis/core/templates/two_factor/core/setup_complete.html diff --git a/biscuit/core/templates/two_factor/profile/profile.html b/aleksis/core/templates/two_factor/profile/profile.html similarity index 100% rename from biscuit/core/templates/two_factor/profile/profile.html rename to aleksis/core/templates/two_factor/profile/profile.html diff --git a/biscuit/core/templatetags/__init__.py b/aleksis/core/templatetags/__init__.py similarity index 100% rename from biscuit/core/templatetags/__init__.py rename to aleksis/core/templatetags/__init__.py diff --git a/biscuit/core/templatetags/apps.py b/aleksis/core/templatetags/apps.py similarity index 100% rename from biscuit/core/templatetags/apps.py rename to aleksis/core/templatetags/apps.py diff --git a/biscuit/core/templatetags/data_helpers.py b/aleksis/core/templatetags/data_helpers.py similarity index 100% rename from biscuit/core/templatetags/data_helpers.py rename to aleksis/core/templatetags/data_helpers.py diff --git a/biscuit/core/templatetags/templatetags/__init__.py b/aleksis/core/templatetags/templatetags/__init__.py similarity index 100% rename from biscuit/core/templatetags/templatetags/__init__.py rename to aleksis/core/templatetags/templatetags/__init__.py diff --git a/biscuit/core/templatetags/templatetags/copy_filter.py b/aleksis/core/templatetags/templatetags/copy_filter.py similarity index 100% rename from biscuit/core/templatetags/templatetags/copy_filter.py rename to aleksis/core/templatetags/templatetags/copy_filter.py diff --git a/biscuit/core/templatetags/templatetags/msg_box.py b/aleksis/core/templatetags/templatetags/msg_box.py similarity index 100% rename from biscuit/core/templatetags/templatetags/msg_box.py rename to aleksis/core/templatetags/templatetags/msg_box.py diff --git a/biscuit/core/templatetags/templatetags/tex.py b/aleksis/core/templatetags/templatetags/tex.py similarity index 100% rename from biscuit/core/templatetags/templatetags/tex.py rename to aleksis/core/templatetags/templatetags/tex.py diff --git a/biscuit/core/templatetags/templatetags/url_name.py b/aleksis/core/templatetags/templatetags/url_name.py similarity index 100% rename from biscuit/core/templatetags/templatetags/url_name.py rename to aleksis/core/templatetags/templatetags/url_name.py diff --git a/biscuit/core/tests/browser/test_selenium.py b/aleksis/core/tests/browser/test_selenium.py similarity index 97% rename from biscuit/core/tests/browser/test_selenium.py rename to aleksis/core/tests/browser/test_selenium.py index 4fff999cab330c75c6166b55307919f682970d4f..6a5f737f31f9cb168a3f1508721c46db1c0adc22 100644 --- a/biscuit/core/tests/browser/test_selenium.py +++ b/aleksis/core/tests/browser/test_selenium.py @@ -31,7 +31,7 @@ class SeleniumTests(SeleniumTestCase): def test_index(self): self.selenium.get(self.live_server_url + "/") - assert "BiscuIT" in self.selenium.title + assert "AlekSIS" in self.selenium.title self._screenshot("index.png") def test_login_default_superuser(self): diff --git a/biscuit/core/tests/models/test_person.py b/aleksis/core/tests/models/test_person.py similarity index 83% rename from biscuit/core/tests/models/test_person.py rename to aleksis/core/tests/models/test_person.py index 62861ae1d82b7359080b653049038c9e142a7a27..b42194f22424566bea2b99adc42b6995dbfaf626 100644 --- a/biscuit/core/tests/models/test_person.py +++ b/aleksis/core/tests/models/test_person.py @@ -1,6 +1,6 @@ import pytest -from biscuit.core.models import Person +from aleksis.core.models import Person pytestmark = pytest.mark.django_db diff --git a/biscuit/core/tests/templatetags/test_data_helpers.py b/aleksis/core/tests/templatetags/test_data_helpers.py similarity index 86% rename from biscuit/core/tests/templatetags/test_data_helpers.py rename to aleksis/core/tests/templatetags/test_data_helpers.py index 5f8e975ffdffb5b522ee94927add0a38d742045f..ce43e578dbd84f95ed96a6cf1426d615f7e9c816 100644 --- a/biscuit/core/tests/templatetags/test_data_helpers.py +++ b/aleksis/core/tests/templatetags/test_data_helpers.py @@ -1,4 +1,4 @@ -from biscuit.core.templatetags.data_helpers import get_dict +from aleksis.core.templatetags.data_helpers import get_dict def test_get_dict_object(): diff --git a/biscuit/core/tests/views/test_account.py b/aleksis/core/tests/views/test_account.py similarity index 100% rename from biscuit/core/tests/views/test_account.py rename to aleksis/core/tests/views/test_account.py diff --git a/biscuit/core/urls.py b/aleksis/core/urls.py similarity index 95% rename from biscuit/core/urls.py rename to aleksis/core/urls.py index 9b2e88cfd2009ae6157d0e74e57275661aa90de4..a895fa0518dfab756c6643e47558ce6135484be0 100644 --- a/biscuit/core/urls.py +++ b/aleksis/core/urls.py @@ -50,9 +50,9 @@ if hasattr(settings, "TWILIO_ACCOUNT_SID"): if settings.DEBUG: urlpatterns.append(path("__debug__/", include(debug_toolbar.urls))) -# Automatically mount URLs from all installed BiscuIT apps +# Automatically mount URLs from all installed AlekSIS apps for app_config in apps.app_configs.values(): - if not app_config.name.startswith("biscuit.apps."): + if not app_config.name.startswith("aleksis.apps."): continue urlpatterns.append(path("app/%s/" % app_config.label, include("%s.urls" % app_config.name))) diff --git a/biscuit/core/userinformation.py b/aleksis/core/userinformation.py similarity index 100% rename from biscuit/core/userinformation.py rename to aleksis/core/userinformation.py diff --git a/biscuit/core/util/__init__.py b/aleksis/core/util/__init__.py similarity index 100% rename from biscuit/core/util/__init__.py rename to aleksis/core/util/__init__.py diff --git a/biscuit/core/util/apps.py b/aleksis/core/util/apps.py similarity index 100% rename from biscuit/core/util/apps.py rename to aleksis/core/util/apps.py diff --git a/biscuit/core/util/core_helpers.py b/aleksis/core/util/core_helpers.py similarity index 83% rename from biscuit/core/util/core_helpers.py rename to aleksis/core/util/core_helpers.py index 232890ce4e1789204d8d6c30ed7638ee2499b73c..de4ea6c4b6d729130cf8027f3fabf4a345976dc0 100644 --- a/biscuit/core/util/core_helpers.py +++ b/aleksis/core/util/core_helpers.py @@ -21,17 +21,17 @@ def dt_show_toolbar(request: HttpRequest) -> bool: def get_app_packages() -> Sequence[str]: - """ Find all packages within the biscuit.apps namespace. """ + """ Find all packages within the aleksis.apps namespace. """ # Import error are non-fatal here because probably simply no app is installed. try: - import biscuit.apps + import aleksis.apps except ImportError: return [] pkgs = [] - for pkg in pkgutil.iter_modules(biscuit.apps.__path__): - mod = import_module("biscuit.apps.%s" % pkg[1]) + for pkg in pkgutil.iter_modules(aleksis.apps.__path__): + mod = import_module("aleksis.apps.%s" % pkg[1]) # Add additional apps defined in module's INSTALLED_APPS constant additional_apps = getattr(mod, "INSTALLED_APPS", []) @@ -39,7 +39,7 @@ def get_app_packages() -> Sequence[str]: if app not in pkgs: pkgs.append(app) - pkgs.append("biscuit.apps.%s" % pkg[1]) + pkgs.append("aleksis.apps.%s" % pkg[1]) return pkgs diff --git a/biscuit/core/util/helper.py b/aleksis/core/util/helper.py similarity index 100% rename from biscuit/core/util/helper.py rename to aleksis/core/util/helper.py diff --git a/biscuit/core/util/messages.py b/aleksis/core/util/messages.py similarity index 100% rename from biscuit/core/util/messages.py rename to aleksis/core/util/messages.py diff --git a/biscuit/core/util/network.py b/aleksis/core/util/network.py similarity index 100% rename from biscuit/core/util/network.py rename to aleksis/core/util/network.py diff --git a/biscuit/core/util/sass_helpers.py b/aleksis/core/util/sass_helpers.py similarity index 88% rename from biscuit/core/util/sass_helpers.py rename to aleksis/core/util/sass_helpers.py index 9dbb56bf2652dbd385b1faa2e21c5575642e459a..2bb44b09c62a55219272d3021a78daf4aaa07b98 100644 --- a/biscuit/core/util/sass_helpers.py +++ b/aleksis/core/util/sass_helpers.py @@ -1,7 +1,7 @@ from colour import web2hex from sass import SassColor -from biscuit.core.models import theme_settings +from aleksis.core.models import theme_settings def get_colour(html_colour: str) -> SassColor: diff --git a/biscuit/core/views.py b/aleksis/core/views.py similarity index 100% rename from biscuit/core/views.py rename to aleksis/core/views.py diff --git a/biscuit/core/wsgi.py b/aleksis/core/wsgi.py similarity index 63% rename from biscuit/core/wsgi.py rename to aleksis/core/wsgi.py index c364569d798e00c5b4b7c178eb1554dc853101c4..1aa213d48ba2e8b231423ac6c51fcb0ba5b98f46 100644 --- a/biscuit/core/wsgi.py +++ b/aleksis/core/wsgi.py @@ -2,6 +2,6 @@ import os from django.core.wsgi import get_wsgi_application -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "biscuit.core.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "aleksis.core.settings") application = get_wsgi_application() diff --git a/apps/official/BiscuIT-App-Alsijil b/apps/official/BiscuIT-App-Alsijil deleted file mode 160000 index a52358af2722329ae43916adee4b93208991ebc6..0000000000000000000000000000000000000000 --- a/apps/official/BiscuIT-App-Alsijil +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a52358af2722329ae43916adee4b93208991ebc6 diff --git a/apps/official/BiscuIT-App-Chronos b/apps/official/BiscuIT-App-Chronos deleted file mode 160000 index c3dffaa6d1cd91af1f79103e71286e11daf4d62d..0000000000000000000000000000000000000000 --- a/apps/official/BiscuIT-App-Chronos +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c3dffaa6d1cd91af1f79103e71286e11daf4d62d diff --git a/apps/official/BiscuIT-App-Exlibris b/apps/official/BiscuIT-App-Exlibris deleted file mode 160000 index f18823b68731884e9ed661ce92474a54708a6f72..0000000000000000000000000000000000000000 --- a/apps/official/BiscuIT-App-Exlibris +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f18823b68731884e9ed661ce92474a54708a6f72 diff --git a/apps/official/BiscuIT-App-SchILD-NRW b/apps/official/BiscuIT-App-SchILD-NRW deleted file mode 160000 index d3503372579bb067e80c72d0c168ac6e998b8d56..0000000000000000000000000000000000000000 --- a/apps/official/BiscuIT-App-SchILD-NRW +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d3503372579bb067e80c72d0c168ac6e998b8d56 diff --git a/apps/official/BiscuIT-App-Untis b/apps/official/BiscuIT-App-Untis deleted file mode 160000 index f216d0e9da645cfbd3d4e1d865bb16dc4de7946f..0000000000000000000000000000000000000000 --- a/apps/official/BiscuIT-App-Untis +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f216d0e9da645cfbd3d4e1d865bb16dc4de7946f diff --git a/biscuit/core/__init__.py b/biscuit/core/__init__.py deleted file mode 100644 index 4d87b04132c9610b1f3a2a340eb74cc9ede8ceb3..0000000000000000000000000000000000000000 --- a/biscuit/core/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ -import pkg_resources - -try: - __version__ = pkg_resources.get_distribution("BiscuIT-ng").version -except Exception: - __version__ = "unknown" - -default_app_config = "biscuit.core.apps.CoreConfig" diff --git a/biscuit/core/templates/core/icons.html b/biscuit/core/templates/core/icons.html deleted file mode 100644 index 97b83e4842a42b3ce5a24b9c4a7271f412458065..0000000000000000000000000000000000000000 --- a/biscuit/core/templates/core/icons.html +++ /dev/null @@ -1,7 +0,0 @@ -{# -*- engine:django -*- #} - -{% load static %} - -<link rel="shortcut icon" type="image/png" href="{% static 'img/biscuit-logo.png' %}" /> -<link rel="shortcut icon" sizes="196x196" href="{% static 'img/biscuit-logo.png' %}" /> -<link rel="apple-touch-icon" href="{% static 'img/biscuit-logo.png' %}" /> diff --git a/dev.sh b/dev.sh index acc0fbe7a4e4f3bbe5aad27343b38b98b1cc0b80..582cd9bb636b5cabc7fe904b40dd3186ab7ec64c 100755 --- a/dev.sh +++ b/dev.sh @@ -25,14 +25,14 @@ case "$1" in cd "$(dirname "$0")" manage_py=$(realpath manage.py) locales="-l ar -l de_DE -l fr -l nb_NO -l tr_TR" - for d in biscuit/core apps/official/*/biscuit/apps/*; do + for d in aleksis/core apps/official/*/aleksis/apps/*; do echo; echo "Entering $d." poetry run sh -c "cd $d; $manage_py makemessages --no-wrap -i static $locales" done ;; "autopep8") cd "$(dirname "$0")" - for d in biscuit/core apps/official/*/biscuit/apps/*; do + for d in aleksis/core apps/official/*/aleksis/apps/*; do echo; echo "Entering $d." poetry run sh -c "cd $d; autopep8 -i -r ." done @@ -40,15 +40,15 @@ case "$1" in "pylama") cd "$(dirname "$0")" tox_ini=$(realpath tox.ini) - for d in biscuit/core apps/official/*/biscuit/apps/*; do + for d in aleksis/core apps/official/*/aleksis/apps/*; do echo; echo "Entering $d." poetry run sh -c "cd $d; pylama -a -o $tox_ini ." done ;; "gource") - for d in biscuit/core apps/official/*/biscuit/apps/*; do + for d in aleksis/core apps/official/*/aleksis/apps/*; do gource --output-custom-log - "$d" - done | sort -n | gource --log-format custom --background-image biscuit/core/static/img/biscuit-logo.png - + done | sort -n | gource --log-format custom --background-image aleksis/core/static/img/aleksis-logo.png - ;; *) ;; diff --git a/docker-compose.yml b/docker-compose.yml index ca09c5af38ebb0f79d60d0794d0a882ba4ceaace..c4f08ef909b0ce0ed52efb25aec989a16c524426 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,28 +6,28 @@ services: volumes: - postgres_data:/var/lib/postgresql/data/ environment: - - POSTGRES_USER=biscuit - - POSTGRES_DB=biscuit + - POSTGRES_USER=aleksis + - POSTGRES_DB=aleksis memcached: image: memcached:latest app: build: . - image: registry.edugit.org/biscuit/biscuit-ng:${BISCUIT_IMAGE_TAG:-latest} + image: registry.edugit.org/aleksis/aleksis-ng:${ALEKSIS_IMAGE_TAG:-latest} volumes: - - biscuit_data:/var/lib/biscuit/ + - aleksis_data:/var/lib/aleksis/ environment: - - BISCUIT_http__allowed_hosts="['*']" - - BISCUIT_caching__memcached__address=memcached:11211 - - BISCUIT_database__host=db - - BISCUIT_maintenance__debug=${BISCUIT_maintenance__debug:-false} + - ALEKSIS_http__allowed_hosts="['*']" + - ALEKSIS_caching__memcached__address=memcached:11211 + - ALEKSIS_database__host=db + - ALEKSIS_maintenance__debug=${ALEKSIS_maintenance__debug:-false} depends_on: - db - memcached web: build: ./docker/nginx - image: registry.edugit.org/biscuit/biscuit-ng/nginx:${BISCUIT_IMAGE_TAG:-latest} + image: registry.edugit.org/aleksis/aleksis-ng/nginx:${ALEKSIS_IMAGE_TAG:-latest} volumes: - - biscuit_data:/var/lib/biscuit/ + - aleksis_data:/var/lib/aleksis/ ports: - ${NGINX_HTTP_PORT:-8080}:80 depends_on: @@ -35,4 +35,4 @@ services: volumes: postgres_data: - biscuit_data: + aleksis_data: diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index eb1668a08a600197c2abb0b20813e8aff433b9cf..cd3300075e2d65d3b4e1a1e19ea1b2f46c68cebc 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -2,18 +2,18 @@ GUNICORN_BIND=${GUNICORN_BIND:-0.0.0.0:8000} -export BISCUIT_database__host=${BISCUIT_database__host:-127.0.0.1} -export BISCUIT_database__port=${BISCUIT_database__port:-5432} +export ALEKSIS_database__host=${ALEKSIS_database__host:-127.0.0.1} +export ALEKSIS_database__port=${ALEKSIS_database__port:-5432} -if [[ -z $BISCUIT_secret_key ]]; then - if [[ ! -e /var/lib/biscuit/secret_key ]]; then - touch /var/lib/biscuit/secret_key; chmod 600 /var/lib/biscuit/secret_key - LC_ALL=C tr -dc 'A-Za-z0-9!"#$%&'\''()*+,-./:;<=>?@[\]^_`{|}~' </dev/urandom | head -c 64 >/var/lib/biscuit/secret_key +if [[ -z $ALEKSIS_secret_key ]]; then + if [[ ! -e /var/lib/aleksis/secret_key ]]; then + touch /var/lib/aleksis/secret_key; chmod 600 /var/lib/aleksis/secret_key + LC_ALL=C tr -dc 'A-Za-z0-9!"#$%&'\''()*+,-./:;<=>?@[\]^_`{|}~' </dev/urandom | head -c 64 >/var/lib/aleksis/secret_key fi - BISCUIT_secret_key=$(</var/lib/biscuit/secret_key) + ALEKSIS_secret_key=$(</var/lib/aleksis/secret_key) fi -while ! nc -z $BISCUIT_database__host $BISCUIT_database__port; do +while ! nc -z $ALEKSIS_database__host $ALEKSIS_database__port; do sleep 0.1 done @@ -24,5 +24,5 @@ python manage.py collectstatic --no-input --clear if [[ -n "$@" ]]; then exec "$@" else - exec gunicorn biscuit.core.wsgi --bind ${GUNICORN_BIND} + exec gunicorn aleksis.core.wsgi --bind ${GUNICORN_BIND} fi diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile index 4f5a2cd405ea5ff980d523df687de50e4835a6f3..18b91b5f17398ee5b2dc6e95bdedc225eb934821 100644 --- a/docker/nginx/Dockerfile +++ b/docker/nginx/Dockerfile @@ -3,4 +3,4 @@ FROM nginx RUN rm /etc/nginx/conf.d/default.conf COPY nginx.conf /etc/nginx/conf.d/default.conf -RUN mkdir /var/lib/biscuit +RUN mkdir /var/lib/aleksis diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf index 39c2ce0be8a1992be9215f64da3ce7ed02527c7d..1264dfb7ebb06410f63aa23329c76c7fe13394db 100644 --- a/docker/nginx/nginx.conf +++ b/docker/nginx/nginx.conf @@ -1,4 +1,4 @@ -upstream biscuit { +upstream aleksis { server app:8000; } @@ -6,17 +6,17 @@ server { listen 80; location / { - proxy_pass http://biscuit; + proxy_pass http://aleksis; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $host; proxy_redirect off; } location /media/ { - alias /var/lib/biscuit/media/; + alias /var/lib/aleksis/media/; } location /static/ { - alias /var/lib/biscuit/static/; + alias /var/lib/aleksis/static/; } } diff --git a/docs/admin/01_config.rst b/docs/admin/01_config.rst index b375ffb8b63d88993e47fa0fb96c16d8217571ee..089c4416b031f7cf78d92ef8a57e3d86084f9094 100644 --- a/docs/admin/01_config.rst +++ b/docs/admin/01_config.rst @@ -4,7 +4,7 @@ Configuration files and format File locations and order ------------------------ -BiscuIT is configured through text files in the directory `/etc/biscuit/`. +AlekSIS is configured through text files in the directory `/etc/aleksis/`. You can place any file types there that are supported by the `Dynaconf`_ configuration system (INI, YAML and TOML). @@ -15,14 +15,14 @@ files, it might be a good idea to number them, e.g. `00_main.toml`, `01_myschool.toml`, `99_temporary.toml`. The TOML format is recommended and is the only format described in detail in -BiscuIT's documentation. For all other formats, refer to the `Dynaconf`_ +AlekSIS’ documentation. For all other formats, refer to the `Dynaconf`_ documentation. Configuration file format (TOML) -------------------------------- TOML file are simple text files that define variables, much like in Python -(i.e. there are scalars, lists and dictionaries). BiscuIT structures its +(i.e. there are scalars, lists and dictionaries). AlekSIS structures its configuration by topic. A configuration file might look like this:: @@ -31,11 +31,11 @@ A configuration file might look like this:: secret_key = "VerySecretKeyForSessionSecurity" [default.http] - allowed_hosts = [ "biscuit.myschool.example.com", "localhost" ] + allowed_hosts = [ "aleksis.myschool.example.com", "localhost" ] [default.database] - name = "biscuit" - user = "biscuit" + name = "aleksis" + user = "aleksis" password = "SuperSecretPassword" [default.caching] @@ -48,6 +48,6 @@ have defined another section called `[default.caching.memcached]` and placed `enabled` and `address` below it as scalars). This can be a bit confusing, so this documentation will explain how to -configure BiscuIT on a per-feature basis. +configure AlekSIS on a per-feature basis. .. _Dynaconf: https://dynaconf.readthedocs.io/en/latest/ diff --git a/docs/admin/02_ldap.rst b/docs/admin/02_ldap.rst index a5b54779f1cf53fd338178bdfc5f4dee3d1cd198..e9c4745fcbf5767c6e6edc2c21f9b4ba0f64742e 100644 --- a/docs/admin/02_ldap.rst +++ b/docs/admin/02_ldap.rst @@ -1,9 +1,9 @@ Authenticating against LDAP =========================== -BiscuIT can authenticate users against an LDAP directory (like OpenLDAP or -Active Directory). The BiscuIT core can only authenticate and synchronise -authenticated users to BiscuIT's database. There are apps that help with +AlekSIS can authenticate users against an LDAP directory (like OpenLDAP or +Active Directory). The AlekSIS core can only authenticate and synchronise +authenticated users to AlekSIS’ database. There are apps that help with tasks like mass-importing accounts and linking accounts to persons in the BiscuIY system (see below). @@ -20,9 +20,9 @@ TBA. Configuration of LDAP support ----------------------------- -Configuration is done under the `default.ldap` section in BiscuIT's +Configuration is done under the `default.ldap` section in AlekSIS’ configuration file. For example, add something like the following to your -configuration (normally in `/etc/biscuit`; you can either append to an +configuration (normally in `/etc/aleksis`; you can either append to an existing file or add a new one):: [default.ldap] diff --git a/docs/admin/03_psql.rst b/docs/admin/03_psql.rst index 6a33e677f5c8297bfa704a04433bfb370bcbc02b..8c544041fdce1dc6ee83d3311526bb3561dcb487 100644 --- a/docs/admin/03_psql.rst +++ b/docs/admin/03_psql.rst @@ -1,8 +1,8 @@ -Installing BiscuIT with PostgreSQL backend +Installing AlekSIS with PostgreSQL backend ========================================== -PostgreSQL is the only supported database backend for BiscuIT. If you are -installing BiscuIT manually, you need to properly set it up. +PostgreSQL is the only supported database backend for AlekSIS. If you are +installing AlekSIS manually, you need to properly set it up. Install the PostgreSQL server ----------------------------- @@ -18,8 +18,8 @@ Create a database and user On Debian, you can use the following commands to create the database and a user who owns it:: - sudo -u postgres createuser -D -P -R -S biscuit - sudo -u postgres createdb -E UTF-8 -O biscuit -T template0 -l C.UTF-8 biscuit + sudo -u postgres createuser -D -P -R -S aleksis + sudo -u postgres createdb -E UTF-8 -O aleksis -T template0 -l C.UTF-8 aleksis When asked for the database user password, choose a secure, preferrably random, password. You can generate one using the pwgen utility if you like:: @@ -27,15 +27,15 @@ random, password. You can generate one using the pwgen utility if you like:: pwgen 16 1 -Configure BiscuIT to use PostgreSQL +Configure AlekSIS to use PostgreSQL ----------------------------------- -Fill in the configuration under `/etc/biscuit/aleksis.toml` (or a file with any other name in this directory):: +Fill in the configuration under `/etc/aleksis/aleksis.toml` (or a file with any other name in this directory):: [default.database] host = "localhost" - name = "biscuit" - username = "biscuit" + name = "aleksis" + username = "aleksis" password = "Y0urV3ryR4nd0mP4ssw0rd" Don't forget to run the migrations, like described in the basic setup guide. diff --git a/docs/conf.py b/docs/conf.py index 19843dc335e66b16aeaecc695c4b721715167e95..41bf9587177ccec3a10fd1242a9eadd791cc442c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -16,16 +16,16 @@ import django import os import sys sys.path.insert(0, os.path.abspath('..')) -os.environ['DJANGO_SETTINGS_MODULE'] = 'biscuit.core.settings' +os.environ['DJANGO_SETTINGS_MODULE'] = 'aleksis.core.settings' os.environ['LOCAL_SETTINGS_FILE'] = os.path.abspath( os.path.join('..', 'local.cfg')) django.setup() # -- Project information ----------------------------------------------------- -project = 'BiscuIT' -copyright = '2019, BiscuIT team @ Teckids e.V.' -author = 'BiscuIT team @ Teckids e.V.' +project = 'AlekSIS' +copyright = '2019, AlekSIS team @ Teckids e.V.' +author = 'AlekSIS team @ Teckids e.V.' # The short X.Y version version = '1.0' @@ -110,7 +110,7 @@ html_static_path = ['_static'] # -- Options for HTMLHelp output --------------------------------------------- # Output file base name for HTML help builder. -htmlhelp_basename = 'BiscuITdoc' +htmlhelp_basename = 'AlekSISdoc' # -- Options for LaTeX output ------------------------------------------------ @@ -137,8 +137,8 @@ latex_elements = { # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - (master_doc, 'BiscuIT.tex', 'BiscuIT Documentation', - 'BiscuIT team @ Teckids e.V.', 'manual'), + (master_doc, 'AlekSIS.tex', 'AlekSIS Documentation', + 'AlekSIS team @ Teckids e.V.', 'manual'), ] @@ -147,7 +147,7 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - (master_doc, 'biscuit', 'BiscuIT Documentation', + (master_doc, 'aleksis', 'AlekSIS Documentation', [author], 1) ] @@ -158,8 +158,8 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - (master_doc, 'BiscuIT', 'BiscuIT Documentation', - author, 'BiscuIT', 'One line description of project.', + (master_doc, 'AlekSIS', 'AlekSIS Documentation', + author, 'AlekSIS', 'One line description of project.', 'Miscellaneous'), ] diff --git a/docs/dev/01_setup.rst b/docs/dev/01_setup.rst index f8b2f8444a3c24bba2b981dea3d2c60f76986279..ee87f42719c1e01a90dfbcfe67ed426ee77607ae 100644 --- a/docs/dev/01_setup.rst +++ b/docs/dev/01_setup.rst @@ -1,12 +1,12 @@ Setting up the development environment ====================================== -BiscuIT and all official apps use `Poetry`_ to manage virtualenvs and +AlekSIS and all official apps use `Poetry`_ to manage virtualenvs and dependencies. You should make yourself a bit confortable with poetry by reading its documentation. Poetry makes a lot of stuff very easy, especially managing a virtual -environment that contains BiscuIT and everything you need to run the +environment that contains AlekSIS and everything you need to run the framework and selected apps. Also, `Yarn`_ is needed to resolve JavaScript dependencies. @@ -14,10 +14,10 @@ Also, `Yarn`_ is needed to resolve JavaScript dependencies. Get the source tree ------------------- -To download BiscuIT and all officially bundled apps in their +To download AlekSIS and all officially bundled apps in their development version, use Git like so:: - git clone --recurse-submodules https://edugit.org/BiscuIT/BiscuIT-ng + git clone --recurse-submodules https://edugit.org/AlekSIS/AlekSIS If you do not want to download the bundled apps, leave out the ``--recurse-submodules`` option. @@ -37,11 +37,11 @@ Poetry). On Debian, for example, this would be done with:: You can use any other of the `Poetry installation methods`_. -Install BiscuIT-ng in its own virtual environment -------------------------------------------------- +Install AlekSIS in its own virtual environment +---------------------------------------------- Poetry will automatically manage virtual environments per project, so -installing BiscuIT is a matter of:: +installing AlekSIS is a matter of:: poetry install @@ -69,12 +69,12 @@ Running the development server ------------------------------ The development server can be started using Django's ``runserver`` command. -You can either configure BiscuIT like in a production environment, or pass +You can either configure AlekSIS like in a production environment, or pass basic settings in as environment variable. Here is an example that runs the development server against a local PostgreSQL database with password -`biscuit` (all else remains default) and with the `debug` setting enabled:: +`aleksis` (all else remains default) and with the `debug` setting enabled:: - BISCUIT_debug=true BISCUIT_database__password=biscuit poetry run ./manage.py runserver + ALEKSIS_debug=true ALEKSIS_database__password=aleksis poetry run ./manage.py runserver .. figure:: /screenshots/index.png :scale: 50% diff --git a/docs/dev/02_install_apps.rst b/docs/dev/02_install_apps.rst index f8e1e7d8cf8b986151654a6e0a51a02579a3eaae..db3fe87f6ff6407ad0ca0db0aec0177720be70dd 100644 --- a/docs/dev/02_install_apps.rst +++ b/docs/dev/02_install_apps.rst @@ -11,7 +11,7 @@ are running. Installing apps into the existing virtual environment is a bit awkward:: - poetry run sh -c "cd apps/official/BiscuIT-App-Exlibris; poetry install" + poetry run sh -c "cd apps/official/AlekSIS-App-Exlibris; poetry install" This will install the Exlibris app (library management) app by using a shell for first ``cd``'ing into the app directory and then using diff --git a/docs/index.rst b/docs/index.rst index 1cb4bca97a4eefddd59278ec377704f425579e0b..11863e5e9bd4590693add06b465a73ca3152e14c 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,10 +1,10 @@ -.. BiscuIT documentation master file, created by +.. AlekSIS documentation master file, created by sphinx-quickstart on Thu Aug 15 10:49:03 2019. You can adapt this file completely to your liking, but it should at least contain the root `toctree` directive. -Welcome to BiscuIT's documentation! -=================================== +Welcome to AlekSIS’ documentation! +================================== .. toctree:: :maxdepth: 2 diff --git a/docs/ref/core/01_models.rst b/docs/ref/core/01_models.rst index bfec932dda1e48a939a707eea20470d34061688b..38daab5f5ff92125be1983f475a565130e972015 100644 --- a/docs/ref/core/01_models.rst +++ b/docs/ref/core/01_models.rst @@ -1,5 +1,5 @@ Core data models ================ -.. automodule:: biscuit.core.models +.. automodule:: aleksis.core.models :members: diff --git a/manage.py b/manage.py index 8b1bc84cb402e24f21d6c2444149e5cbca245173..80c8e811820451fffa585a63b57791a6fe1f4ce2 100755 --- a/manage.py +++ b/manage.py @@ -3,7 +3,7 @@ import os import sys if __name__ == '__main__': - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'biscuit.core.settings') + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'aleksis.core.settings') try: from django.core.management import execute_from_command_line except ImportError as exc: diff --git a/pyproject.toml b/pyproject.toml index d5a86f6480a46521b8fabb5cc53108362a535c36..5be63ccd7c5235e3d735c037835889ee486ca1fd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,17 +1,17 @@ [tool.poetry] -name = "BiscuIT-ng" +name = "AlekSIS" version = "1.0a4.dev0" packages = [ - { include = "biscuit" } + { include = "aleksis" } ] readme = "README.rst" -description = "BiscuIT School Information System (SIS) - Next Generation Platform" +description = "AlekSIS (School Information System) — Core" authors = ["Dominik George <dominik.george@teckids.org>", "Martin Gummi <martin.gummi@teckids.org>", "Julian Leucker <leuckeju@katharineum.de>", "mirabilos <thorsten.glaser@teckids.org>", "Frank Poetzsch-Heffter <p-h@katharineum.de>", "Tom Teichler <tom.teichler@teckids.org>", "Jonathan Weth <wethjo@katharineum.de>", "Hangzhi Yu <yuha@katharineum.de>"] license = "EUPL-1.2" -homepage = "https://biscuit.edugit.io/" -repository = "https://edugit.org/BiscuIT/BiscuIT-ng" -documentation = "https://biscuit.edugit.io/BiscuIT-ng/docs/html/" +homepage = "https://aleksis.edugit.io/" +repository = "https://edugit.org/AlekSIS/AlekSIS" +documentation = "https://aleksis.edugit.io/AlekSIS/docs/html/" classifiers = [ "Environment :: Web Environment", "Intended Audience :: Education", @@ -52,11 +52,11 @@ django-dbsettings = "^1.0.0" django-material = "^1.6.0" [tool.poetry.extras] -app-alsijil = ['BiscuIT-App-Alsijil'] -app-chronos = ['BiscuIT-App-Chronos'] -app-exlibris = ['BiscuIT-App-Exlibris'] -app-schild-nrw = ['BiscuIT-App-SchILD-NRW'] -app-untis = ['BiscuIT-App-Untis'] +app-alsijil = ['AlekSIS-App-Alsijil'] +app-chronos = ['AlekSIS-App-Chronos'] +app-exlibris = ['AlekSIS-App-Exlibris'] +app-schild-nrw = ['AlekSIS-App-SchILD-NRW'] +app-untis = ['AlekSIS-App-Untis'] ldap = ["django-auth-ldap"] [tool.poetry.dev-dependencies] diff --git a/tox.ini b/tox.ini index fa8e3771f4f1e0a73cd4261246475b07c9661efe..c6d978b969712b148cd9bbe602ecf385eff690c7 100644 --- a/tox.ini +++ b/tox.ini @@ -9,7 +9,7 @@ skip_install = true envdir = {toxworkdir}/globalenv commands_pre = ./dev.sh install-all commands = - poetry run pytest --cov=. {posargs} biscuit/ apps/official/ + poetry run pytest --cov=. {posargs} aleksis/ apps/official/ [testenv:selenium] setenv = @@ -20,9 +20,9 @@ setenv = [testenv:lint] commands = - - poetry run black --check --diff biscuit/ apps/official/ - - poetry run isort -c --diff --stdout -rc biscuit/ apps/official/ - poetry run flake8 {posargs} biscuit/ apps/official/ + - poetry run black --check --diff aleksis/ apps/official/ + - poetry run isort -c --diff --stdout -rc aleksis/ apps/official/ + poetry run flake8 {posargs} aleksis/ apps/official/ [testenv:security] commands = @@ -38,8 +38,8 @@ commands = poetry run make -C docs/ html {posargs} [testenv:reformat] commands = - poetry run isort -rc biscuit/ apps/official/ - poetry run black biscuit/ apps/official/ + poetry run isort -rc aleksis/ apps/official/ + poetry run black aleksis/ apps/official/ [flake8] max_line_length = 100 @@ -52,7 +52,7 @@ multi_line_output = 3 include_trailing_comma = 1 use_parantheses = 1 default_section = THIRDPARTY -known_first_party = biscuit +known_first_party = aleksis known_django = django sections = FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER @@ -66,10 +66,10 @@ ignore_missing_imports = True cache_dir = /dev/null [mypy.plugins.django-stubs] -django_settings_module = biscuit.core.settings +django_settings_module = aleksis.core.settings [pytest] -DJANGO_SETTINGS_MODULE = biscuit.core.settings +DJANGO_SETTINGS_MODULE = aleksis.core.settings junit_family = legacy [coverage:run]