From 55f19a8a99a1a395e44c67d5a14213e70aefe490 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Sun, 15 Nov 2020 13:34:00 +0100
Subject: [PATCH] Move app
---
deploy_pypi.yml | 18 ++++++++++++++
poetry.lock | 22 +++++++-----------
pyproject.toml | 5 +++-
.../ticdesk => ticdesk}/.vscode/settings.json | 0
{aleksis/apps/ticdesk => ticdesk}/__init__.py | 0
{aleksis/apps/ticdesk => ticdesk}/_version.py | 0
{aleksis/apps/ticdesk => ticdesk}/apps.py | 0
{aleksis/apps/ticdesk => ticdesk}/filters.py | 0
{aleksis/apps/ticdesk => ticdesk}/forms.py | 0
.../locale/ar/LC_MESSAGES/django.po | 0
.../locale/de_DE/LC_MESSAGES/django.po | 0
.../locale/en/LC_MESSAGES/django.po | 0
.../locale/fr/LC_MESSAGES/django.po | 0
.../locale/la/LC_MESSAGES/django.po | 0
.../locale/nb_NO/LC_MESSAGES/django.po | 0
.../locale/tr_TR/LC_MESSAGES/django.po | 0
{aleksis/apps/ticdesk => ticdesk}/menus.py | 0
.../migrations/0001_initial.py | 0
.../migrations/0002_mail_addresses.py | 0
.../migrations/0003_auto_20200529_1949.py | 0
.../migrations/0004_auto_20200529_2018.py | 0
.../migrations/0005_auto_20200529_2048.py | 0
.../migrations/0006_teckidsmember.py | 0
.../migrations/0007_auto_20200728_1145.py | 0
.../migrations/0008_auto_20200728_1352.py | 0
.../migrations/0009_auto_20200728_1504.py | 0
.../migrations/0010_auto_20200728_2017.py | 0
.../migrations/0011_auto_20200728_2119.py | 0
.../migrations/0012_auto_20200729_1640.py | 0
.../migrations/0013_auto_20200729_1738.py | 0
.../migrations/0014_auto_20200731_1511.py | 0
.../migrations/0015_auto_20200802_1340.py | 0
...16_eventfeedback_feedbackfeedbackaspect.py | 0
.../migrations/0017_auto_20200802_1507.py | 0
.../migrations/0018_auto_20200802_1646.py | 0
.../migrations/0019_auto_20200926_2018.py | 0
.../migrations/__init__.py | 0
.../ticdesk => ticdesk}/model_extensions.py | 0
{aleksis/apps/ticdesk => ticdesk}/models.py | 0
.../apps/ticdesk => ticdesk}/predicates.py | 0
.../apps/ticdesk => ticdesk}/preferences.py | 0
{aleksis/apps/ticdesk => ticdesk}/rules.py | 0
{aleksis/apps/ticdesk => ticdesk}/settings.py | 0
.../static/dead-dolphin.png | Bin
.../ticdesk => ticdesk}/static/favicon.ico | Bin
.../ticdesk => ticdesk}/static/favicon.png | Bin
.../static/forbidden-dolphin.png | Bin
.../static/img/teckids_logo.svg | 0
.../static/img/teckids_logo_de.svg | 0
.../static/img/teckids_logo_en.svg | 0
.../static/maintenance_dolphin.png | Bin
.../static/sad-dolphin.png | Bin
.../ticdesk => ticdesk}/static/style.less | 0
{aleksis/apps/ticdesk => ticdesk}/tables.py | 0
.../templated_email/event_created.email | 0
.../templated_email/event_registred.email | 0
.../ticdesk/event_registration/full.html | 0
.../ticdesk/event_registration/list.html | 0
.../ticdesk/feedback_aspect/edit.html | 0
.../ticdesk/feedback_aspect/list.html | 0
.../templates/ticdesk/print/corona.html | 0
.../ticdesk/print/list_attendance.html | 0
.../ticdesk/print/list_participants.html | 0
.../templates/ticdesk/print/list_sign.html | 0
.../templates/ticdesk/print/manage.html | 0
.../templates/ticdesk/print/voucher.html | 0
.../templates/ticdesk/teckids_event/edit.html | 0
.../ticdesk/teckids_event/feedback.html | 0
.../templates/ticdesk/teckids_event/list.html | 0
.../ticdesk/teckids_event/manage.html | 0
.../ticdesk/teckids_event/register.html | 0
.../teckids_event/register_additional.html | 0
.../ticdesk/teckids_member/edit.html | 0
.../ticdesk/teckids_member/list.html | 0
.../templates/ticdesk/voucher/edit.html | 0
.../templates/ticdesk/voucher/list.html | 0
{aleksis/apps/ticdesk => ticdesk}/urls.py | 0
{aleksis/apps/ticdesk => ticdesk}/util.py | 0
{aleksis/apps/ticdesk => ticdesk}/views.py | 0
79 files changed, 31 insertions(+), 14 deletions(-)
create mode 100644 deploy_pypi.yml
rename {aleksis/apps/ticdesk => ticdesk}/.vscode/settings.json (100%)
rename {aleksis/apps/ticdesk => ticdesk}/__init__.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/_version.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/apps.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/filters.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/forms.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/locale/ar/LC_MESSAGES/django.po (100%)
rename {aleksis/apps/ticdesk => ticdesk}/locale/de_DE/LC_MESSAGES/django.po (100%)
rename {aleksis/apps/ticdesk => ticdesk}/locale/en/LC_MESSAGES/django.po (100%)
rename {aleksis/apps/ticdesk => ticdesk}/locale/fr/LC_MESSAGES/django.po (100%)
rename {aleksis/apps/ticdesk => ticdesk}/locale/la/LC_MESSAGES/django.po (100%)
rename {aleksis/apps/ticdesk => ticdesk}/locale/nb_NO/LC_MESSAGES/django.po (100%)
rename {aleksis/apps/ticdesk => ticdesk}/locale/tr_TR/LC_MESSAGES/django.po (100%)
rename {aleksis/apps/ticdesk => ticdesk}/menus.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/migrations/0001_initial.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/migrations/0002_mail_addresses.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/migrations/0003_auto_20200529_1949.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/migrations/0004_auto_20200529_2018.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/migrations/0005_auto_20200529_2048.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/migrations/0006_teckidsmember.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/migrations/0007_auto_20200728_1145.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/migrations/0008_auto_20200728_1352.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/migrations/0009_auto_20200728_1504.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/migrations/0010_auto_20200728_2017.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/migrations/0011_auto_20200728_2119.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/migrations/0012_auto_20200729_1640.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/migrations/0013_auto_20200729_1738.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/migrations/0014_auto_20200731_1511.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/migrations/0015_auto_20200802_1340.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/migrations/0016_eventfeedback_feedbackfeedbackaspect.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/migrations/0017_auto_20200802_1507.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/migrations/0018_auto_20200802_1646.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/migrations/0019_auto_20200926_2018.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/migrations/__init__.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/model_extensions.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/models.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/predicates.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/preferences.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/rules.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/settings.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/static/dead-dolphin.png (100%)
rename {aleksis/apps/ticdesk => ticdesk}/static/favicon.ico (100%)
rename {aleksis/apps/ticdesk => ticdesk}/static/favicon.png (100%)
rename {aleksis/apps/ticdesk => ticdesk}/static/forbidden-dolphin.png (100%)
rename {aleksis/apps/ticdesk => ticdesk}/static/img/teckids_logo.svg (100%)
rename {aleksis/apps/ticdesk => ticdesk}/static/img/teckids_logo_de.svg (100%)
rename {aleksis/apps/ticdesk => ticdesk}/static/img/teckids_logo_en.svg (100%)
rename {aleksis/apps/ticdesk => ticdesk}/static/maintenance_dolphin.png (100%)
rename {aleksis/apps/ticdesk => ticdesk}/static/sad-dolphin.png (100%)
rename {aleksis/apps/ticdesk => ticdesk}/static/style.less (100%)
rename {aleksis/apps/ticdesk => ticdesk}/tables.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/templates/templated_email/event_created.email (100%)
rename {aleksis/apps/ticdesk => ticdesk}/templates/templated_email/event_registred.email (100%)
rename {aleksis/apps/ticdesk => ticdesk}/templates/ticdesk/event_registration/full.html (100%)
rename {aleksis/apps/ticdesk => ticdesk}/templates/ticdesk/event_registration/list.html (100%)
rename {aleksis/apps/ticdesk => ticdesk}/templates/ticdesk/feedback_aspect/edit.html (100%)
rename {aleksis/apps/ticdesk => ticdesk}/templates/ticdesk/feedback_aspect/list.html (100%)
rename {aleksis/apps/ticdesk => ticdesk}/templates/ticdesk/print/corona.html (100%)
rename {aleksis/apps/ticdesk => ticdesk}/templates/ticdesk/print/list_attendance.html (100%)
rename {aleksis/apps/ticdesk => ticdesk}/templates/ticdesk/print/list_participants.html (100%)
rename {aleksis/apps/ticdesk => ticdesk}/templates/ticdesk/print/list_sign.html (100%)
rename {aleksis/apps/ticdesk => ticdesk}/templates/ticdesk/print/manage.html (100%)
rename {aleksis/apps/ticdesk => ticdesk}/templates/ticdesk/print/voucher.html (100%)
rename {aleksis/apps/ticdesk => ticdesk}/templates/ticdesk/teckids_event/edit.html (100%)
rename {aleksis/apps/ticdesk => ticdesk}/templates/ticdesk/teckids_event/feedback.html (100%)
rename {aleksis/apps/ticdesk => ticdesk}/templates/ticdesk/teckids_event/list.html (100%)
rename {aleksis/apps/ticdesk => ticdesk}/templates/ticdesk/teckids_event/manage.html (100%)
rename {aleksis/apps/ticdesk => ticdesk}/templates/ticdesk/teckids_event/register.html (100%)
rename {aleksis/apps/ticdesk => ticdesk}/templates/ticdesk/teckids_event/register_additional.html (100%)
rename {aleksis/apps/ticdesk => ticdesk}/templates/ticdesk/teckids_member/edit.html (100%)
rename {aleksis/apps/ticdesk => ticdesk}/templates/ticdesk/teckids_member/list.html (100%)
rename {aleksis/apps/ticdesk => ticdesk}/templates/ticdesk/voucher/edit.html (100%)
rename {aleksis/apps/ticdesk => ticdesk}/templates/ticdesk/voucher/list.html (100%)
rename {aleksis/apps/ticdesk => ticdesk}/urls.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/util.py (100%)
rename {aleksis/apps/ticdesk => ticdesk}/views.py (100%)
diff --git a/deploy_pypi.yml b/deploy_pypi.yml
new file mode 100644
index 0000000..0289fa0
--- /dev/null
+++ b/deploy_pypi.yml
@@ -0,0 +1,18 @@
+deploy_pypi:
+ stage: deploy
+ script:
+ - if [ $CI_COMMIT_REF_NAME = master ]; then
+ poetry version $(poetry version | cut -d" " -f2)+$(date --date=${CI_COMMIT_TIMESTAMP} +%Y%m%d%H%M%S).${CI_COMMIT_SHORT_SHA} ;
+ elif [ x$CI_COMMIT_REF_NAME = x$CI_COMMIT_TAG ]; then
+ if ! [ "$(poetry version | cut -d" " -f2)" = $CI_COMMIT_REF_NAME ]; then
+ echo "Package version does not match tag. Aborting build of tag!" >/dev/fd/2 ;
+ exit 1 ;
+ fi ;
+ fi
+ - poetry publish -r gitlab
+ - if [ x$CI_COMMIT_REF_NAME = x$CI_COMMIT_TAG ]; then
+ poetry publish ;
+ fi
+ only:
+ - master
+ - tags
diff --git a/poetry.lock b/poetry.lock
index acd560b..027810c 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -8,11 +8,11 @@ python-versions = "*"
[[package]]
name = "aleksis-core"
-version = "2.0a3.dev0+20201114132749.88d92354"
+version = "2.0a3.dev0"
description = "AlekSIS (School Information System) — Core"
category = "main"
optional = false
-python-versions = ">=3.7,<4.0"
+python-versions = "^3.7"
[package.dependencies]
calendarweek = ">=0.4.3,<0.5.0"
@@ -70,13 +70,14 @@ rules = ">=2.2,<3.0"
spdx-license-list = ">=0.5.0,<0.6.0"
[package.extras]
-celery = ["Celery[django,redis] (>=4.4.0,<5.0.0)", "celery-haystack (>=0.10.0,<0.11.0)", "django-celery-beat (>=2.0.0,<3.0.0)", "django-celery-email (>=3.0.0,<4.0.0)", "django-celery-results (>=1.1.2,<2.0.0)"]
+celery = ["celery-haystack (>=0.10.0,<0.11.0)", "django-celery-results (>=1.1.2,<2.0.0)", "Celery[django,redis] (>=4.4.0,<5.0.0)", "django-celery-email (>=3.0.0,<4.0.0)", "django-celery-beat (>=2.0.0,<3.0.0)"]
ldap = ["django-auth-ldap (>=2.2,<3.0)"]
[package.source]
-type = "legacy"
-url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple"
-reference = "gitlab"
+type = "git"
+url = "https://edugit.org/AlekSIS/official/AlekSIS-Core"
+reference = "feature/use-entrypoints"
+resolved_reference = "293c29505453b34766322c5c56786484f28b1754"
[[package]]
name = "appdirs"
@@ -2078,19 +2079,14 @@ pycryptodome = "*"
[metadata]
lock-version = "1.1"
python-versions = "^3.8"
-content-hash = "4ec5a91060911dd58c3235f9aa149fa51e76fe7a9290e20f47e587cc5d58ae3b"
+content-hash = "836246c877bb6fb4edf5d4a115b12bf616baecb8e3cc34b8b9282b7b17e18421"
[metadata.files]
alabaster = [
{file = "alabaster-0.7.12-py2.py3-none-any.whl", hash = "sha256:446438bdcca0e05bd45ea2de1668c1d9b032e1a9154c2c259092d77031ddd359"},
{file = "alabaster-0.7.12.tar.gz", hash = "sha256:a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02"},
]
-aleksis-core = [
- {file = "AlekSIS-Core-2.0a3.dev0+20201114132749.88d92354.tar.gz", hash = "sha256:be16d8b6478029ec86cc92389a5f679be85112cb20d18996c8ae95adf86690ba"},
- {file = "AlekSIS-Core-2.0a3.dev0+20201114154746.9129dcd7.tar.gz", hash = "sha256:89bf9908411953eb337cc40b702f00394d4ff137fcd5160c538608c0a867a294"},
- {file = "AlekSIS_Core-2.0a3.dev0+20201114132749.88d92354-py3-none-any.whl", hash = "sha256:180477173a1e23f9ca42b6b79383b556dbd97868e3f3079c8b090466aeba256c"},
- {file = "AlekSIS_Core-2.0a3.dev0+20201114154746.9129dcd7-py3-none-any.whl", hash = "sha256:a60b456a300f1fa7786567cb0b948690422c95492a0cec936a0b99d6109afed5"},
-]
+aleksis-core = []
appdirs = [
{file = "appdirs-1.4.4-py2.py3-none-any.whl", hash = "sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128"},
{file = "appdirs-1.4.4.tar.gz", hash = "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"},
diff --git a/pyproject.toml b/pyproject.toml
index 1fd0d4e..52f818f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -35,7 +35,7 @@ python-pam = "^1.8.4"
python-resize-image = "^1.1.19"
redis-collections = "^0.8.0"
django-iban-field = "^0.8"
-aleksis-core = "^2.0a3.dev0"
+aleksis-core = { git = "https://edugit.org/AlekSIS/official/AlekSIS-Core", branch = "feature/use-entrypoints" }
[tool.poetry.dev-dependencies]
sphinx = "^3.0"
@@ -62,6 +62,9 @@ flake8-isort = "^4.0.0"
pytest-cov = "^2.8.1"
pytest-sugar = "^0.9.2"
+[tool.poetry.plugins."aleksis.app"]
+ticdesk = "ticdesk.apps:TICDeskConfig"
+
[tool.black]
line-length = 100
exclude = "/migrations/"
diff --git a/aleksis/apps/ticdesk/.vscode/settings.json b/ticdesk/.vscode/settings.json
similarity index 100%
rename from aleksis/apps/ticdesk/.vscode/settings.json
rename to ticdesk/.vscode/settings.json
diff --git a/aleksis/apps/ticdesk/__init__.py b/ticdesk/__init__.py
similarity index 100%
rename from aleksis/apps/ticdesk/__init__.py
rename to ticdesk/__init__.py
diff --git a/aleksis/apps/ticdesk/_version.py b/ticdesk/_version.py
similarity index 100%
rename from aleksis/apps/ticdesk/_version.py
rename to ticdesk/_version.py
diff --git a/aleksis/apps/ticdesk/apps.py b/ticdesk/apps.py
similarity index 100%
rename from aleksis/apps/ticdesk/apps.py
rename to ticdesk/apps.py
diff --git a/aleksis/apps/ticdesk/filters.py b/ticdesk/filters.py
similarity index 100%
rename from aleksis/apps/ticdesk/filters.py
rename to ticdesk/filters.py
diff --git a/aleksis/apps/ticdesk/forms.py b/ticdesk/forms.py
similarity index 100%
rename from aleksis/apps/ticdesk/forms.py
rename to ticdesk/forms.py
diff --git a/aleksis/apps/ticdesk/locale/ar/LC_MESSAGES/django.po b/ticdesk/locale/ar/LC_MESSAGES/django.po
similarity index 100%
rename from aleksis/apps/ticdesk/locale/ar/LC_MESSAGES/django.po
rename to ticdesk/locale/ar/LC_MESSAGES/django.po
diff --git a/aleksis/apps/ticdesk/locale/de_DE/LC_MESSAGES/django.po b/ticdesk/locale/de_DE/LC_MESSAGES/django.po
similarity index 100%
rename from aleksis/apps/ticdesk/locale/de_DE/LC_MESSAGES/django.po
rename to ticdesk/locale/de_DE/LC_MESSAGES/django.po
diff --git a/aleksis/apps/ticdesk/locale/en/LC_MESSAGES/django.po b/ticdesk/locale/en/LC_MESSAGES/django.po
similarity index 100%
rename from aleksis/apps/ticdesk/locale/en/LC_MESSAGES/django.po
rename to ticdesk/locale/en/LC_MESSAGES/django.po
diff --git a/aleksis/apps/ticdesk/locale/fr/LC_MESSAGES/django.po b/ticdesk/locale/fr/LC_MESSAGES/django.po
similarity index 100%
rename from aleksis/apps/ticdesk/locale/fr/LC_MESSAGES/django.po
rename to ticdesk/locale/fr/LC_MESSAGES/django.po
diff --git a/aleksis/apps/ticdesk/locale/la/LC_MESSAGES/django.po b/ticdesk/locale/la/LC_MESSAGES/django.po
similarity index 100%
rename from aleksis/apps/ticdesk/locale/la/LC_MESSAGES/django.po
rename to ticdesk/locale/la/LC_MESSAGES/django.po
diff --git a/aleksis/apps/ticdesk/locale/nb_NO/LC_MESSAGES/django.po b/ticdesk/locale/nb_NO/LC_MESSAGES/django.po
similarity index 100%
rename from aleksis/apps/ticdesk/locale/nb_NO/LC_MESSAGES/django.po
rename to ticdesk/locale/nb_NO/LC_MESSAGES/django.po
diff --git a/aleksis/apps/ticdesk/locale/tr_TR/LC_MESSAGES/django.po b/ticdesk/locale/tr_TR/LC_MESSAGES/django.po
similarity index 100%
rename from aleksis/apps/ticdesk/locale/tr_TR/LC_MESSAGES/django.po
rename to ticdesk/locale/tr_TR/LC_MESSAGES/django.po
diff --git a/aleksis/apps/ticdesk/menus.py b/ticdesk/menus.py
similarity index 100%
rename from aleksis/apps/ticdesk/menus.py
rename to ticdesk/menus.py
diff --git a/aleksis/apps/ticdesk/migrations/0001_initial.py b/ticdesk/migrations/0001_initial.py
similarity index 100%
rename from aleksis/apps/ticdesk/migrations/0001_initial.py
rename to ticdesk/migrations/0001_initial.py
diff --git a/aleksis/apps/ticdesk/migrations/0002_mail_addresses.py b/ticdesk/migrations/0002_mail_addresses.py
similarity index 100%
rename from aleksis/apps/ticdesk/migrations/0002_mail_addresses.py
rename to ticdesk/migrations/0002_mail_addresses.py
diff --git a/aleksis/apps/ticdesk/migrations/0003_auto_20200529_1949.py b/ticdesk/migrations/0003_auto_20200529_1949.py
similarity index 100%
rename from aleksis/apps/ticdesk/migrations/0003_auto_20200529_1949.py
rename to ticdesk/migrations/0003_auto_20200529_1949.py
diff --git a/aleksis/apps/ticdesk/migrations/0004_auto_20200529_2018.py b/ticdesk/migrations/0004_auto_20200529_2018.py
similarity index 100%
rename from aleksis/apps/ticdesk/migrations/0004_auto_20200529_2018.py
rename to ticdesk/migrations/0004_auto_20200529_2018.py
diff --git a/aleksis/apps/ticdesk/migrations/0005_auto_20200529_2048.py b/ticdesk/migrations/0005_auto_20200529_2048.py
similarity index 100%
rename from aleksis/apps/ticdesk/migrations/0005_auto_20200529_2048.py
rename to ticdesk/migrations/0005_auto_20200529_2048.py
diff --git a/aleksis/apps/ticdesk/migrations/0006_teckidsmember.py b/ticdesk/migrations/0006_teckidsmember.py
similarity index 100%
rename from aleksis/apps/ticdesk/migrations/0006_teckidsmember.py
rename to ticdesk/migrations/0006_teckidsmember.py
diff --git a/aleksis/apps/ticdesk/migrations/0007_auto_20200728_1145.py b/ticdesk/migrations/0007_auto_20200728_1145.py
similarity index 100%
rename from aleksis/apps/ticdesk/migrations/0007_auto_20200728_1145.py
rename to ticdesk/migrations/0007_auto_20200728_1145.py
diff --git a/aleksis/apps/ticdesk/migrations/0008_auto_20200728_1352.py b/ticdesk/migrations/0008_auto_20200728_1352.py
similarity index 100%
rename from aleksis/apps/ticdesk/migrations/0008_auto_20200728_1352.py
rename to ticdesk/migrations/0008_auto_20200728_1352.py
diff --git a/aleksis/apps/ticdesk/migrations/0009_auto_20200728_1504.py b/ticdesk/migrations/0009_auto_20200728_1504.py
similarity index 100%
rename from aleksis/apps/ticdesk/migrations/0009_auto_20200728_1504.py
rename to ticdesk/migrations/0009_auto_20200728_1504.py
diff --git a/aleksis/apps/ticdesk/migrations/0010_auto_20200728_2017.py b/ticdesk/migrations/0010_auto_20200728_2017.py
similarity index 100%
rename from aleksis/apps/ticdesk/migrations/0010_auto_20200728_2017.py
rename to ticdesk/migrations/0010_auto_20200728_2017.py
diff --git a/aleksis/apps/ticdesk/migrations/0011_auto_20200728_2119.py b/ticdesk/migrations/0011_auto_20200728_2119.py
similarity index 100%
rename from aleksis/apps/ticdesk/migrations/0011_auto_20200728_2119.py
rename to ticdesk/migrations/0011_auto_20200728_2119.py
diff --git a/aleksis/apps/ticdesk/migrations/0012_auto_20200729_1640.py b/ticdesk/migrations/0012_auto_20200729_1640.py
similarity index 100%
rename from aleksis/apps/ticdesk/migrations/0012_auto_20200729_1640.py
rename to ticdesk/migrations/0012_auto_20200729_1640.py
diff --git a/aleksis/apps/ticdesk/migrations/0013_auto_20200729_1738.py b/ticdesk/migrations/0013_auto_20200729_1738.py
similarity index 100%
rename from aleksis/apps/ticdesk/migrations/0013_auto_20200729_1738.py
rename to ticdesk/migrations/0013_auto_20200729_1738.py
diff --git a/aleksis/apps/ticdesk/migrations/0014_auto_20200731_1511.py b/ticdesk/migrations/0014_auto_20200731_1511.py
similarity index 100%
rename from aleksis/apps/ticdesk/migrations/0014_auto_20200731_1511.py
rename to ticdesk/migrations/0014_auto_20200731_1511.py
diff --git a/aleksis/apps/ticdesk/migrations/0015_auto_20200802_1340.py b/ticdesk/migrations/0015_auto_20200802_1340.py
similarity index 100%
rename from aleksis/apps/ticdesk/migrations/0015_auto_20200802_1340.py
rename to ticdesk/migrations/0015_auto_20200802_1340.py
diff --git a/aleksis/apps/ticdesk/migrations/0016_eventfeedback_feedbackfeedbackaspect.py b/ticdesk/migrations/0016_eventfeedback_feedbackfeedbackaspect.py
similarity index 100%
rename from aleksis/apps/ticdesk/migrations/0016_eventfeedback_feedbackfeedbackaspect.py
rename to ticdesk/migrations/0016_eventfeedback_feedbackfeedbackaspect.py
diff --git a/aleksis/apps/ticdesk/migrations/0017_auto_20200802_1507.py b/ticdesk/migrations/0017_auto_20200802_1507.py
similarity index 100%
rename from aleksis/apps/ticdesk/migrations/0017_auto_20200802_1507.py
rename to ticdesk/migrations/0017_auto_20200802_1507.py
diff --git a/aleksis/apps/ticdesk/migrations/0018_auto_20200802_1646.py b/ticdesk/migrations/0018_auto_20200802_1646.py
similarity index 100%
rename from aleksis/apps/ticdesk/migrations/0018_auto_20200802_1646.py
rename to ticdesk/migrations/0018_auto_20200802_1646.py
diff --git a/aleksis/apps/ticdesk/migrations/0019_auto_20200926_2018.py b/ticdesk/migrations/0019_auto_20200926_2018.py
similarity index 100%
rename from aleksis/apps/ticdesk/migrations/0019_auto_20200926_2018.py
rename to ticdesk/migrations/0019_auto_20200926_2018.py
diff --git a/aleksis/apps/ticdesk/migrations/__init__.py b/ticdesk/migrations/__init__.py
similarity index 100%
rename from aleksis/apps/ticdesk/migrations/__init__.py
rename to ticdesk/migrations/__init__.py
diff --git a/aleksis/apps/ticdesk/model_extensions.py b/ticdesk/model_extensions.py
similarity index 100%
rename from aleksis/apps/ticdesk/model_extensions.py
rename to ticdesk/model_extensions.py
diff --git a/aleksis/apps/ticdesk/models.py b/ticdesk/models.py
similarity index 100%
rename from aleksis/apps/ticdesk/models.py
rename to ticdesk/models.py
diff --git a/aleksis/apps/ticdesk/predicates.py b/ticdesk/predicates.py
similarity index 100%
rename from aleksis/apps/ticdesk/predicates.py
rename to ticdesk/predicates.py
diff --git a/aleksis/apps/ticdesk/preferences.py b/ticdesk/preferences.py
similarity index 100%
rename from aleksis/apps/ticdesk/preferences.py
rename to ticdesk/preferences.py
diff --git a/aleksis/apps/ticdesk/rules.py b/ticdesk/rules.py
similarity index 100%
rename from aleksis/apps/ticdesk/rules.py
rename to ticdesk/rules.py
diff --git a/aleksis/apps/ticdesk/settings.py b/ticdesk/settings.py
similarity index 100%
rename from aleksis/apps/ticdesk/settings.py
rename to ticdesk/settings.py
diff --git a/aleksis/apps/ticdesk/static/dead-dolphin.png b/ticdesk/static/dead-dolphin.png
similarity index 100%
rename from aleksis/apps/ticdesk/static/dead-dolphin.png
rename to ticdesk/static/dead-dolphin.png
diff --git a/aleksis/apps/ticdesk/static/favicon.ico b/ticdesk/static/favicon.ico
similarity index 100%
rename from aleksis/apps/ticdesk/static/favicon.ico
rename to ticdesk/static/favicon.ico
diff --git a/aleksis/apps/ticdesk/static/favicon.png b/ticdesk/static/favicon.png
similarity index 100%
rename from aleksis/apps/ticdesk/static/favicon.png
rename to ticdesk/static/favicon.png
diff --git a/aleksis/apps/ticdesk/static/forbidden-dolphin.png b/ticdesk/static/forbidden-dolphin.png
similarity index 100%
rename from aleksis/apps/ticdesk/static/forbidden-dolphin.png
rename to ticdesk/static/forbidden-dolphin.png
diff --git a/aleksis/apps/ticdesk/static/img/teckids_logo.svg b/ticdesk/static/img/teckids_logo.svg
similarity index 100%
rename from aleksis/apps/ticdesk/static/img/teckids_logo.svg
rename to ticdesk/static/img/teckids_logo.svg
diff --git a/aleksis/apps/ticdesk/static/img/teckids_logo_de.svg b/ticdesk/static/img/teckids_logo_de.svg
similarity index 100%
rename from aleksis/apps/ticdesk/static/img/teckids_logo_de.svg
rename to ticdesk/static/img/teckids_logo_de.svg
diff --git a/aleksis/apps/ticdesk/static/img/teckids_logo_en.svg b/ticdesk/static/img/teckids_logo_en.svg
similarity index 100%
rename from aleksis/apps/ticdesk/static/img/teckids_logo_en.svg
rename to ticdesk/static/img/teckids_logo_en.svg
diff --git a/aleksis/apps/ticdesk/static/maintenance_dolphin.png b/ticdesk/static/maintenance_dolphin.png
similarity index 100%
rename from aleksis/apps/ticdesk/static/maintenance_dolphin.png
rename to ticdesk/static/maintenance_dolphin.png
diff --git a/aleksis/apps/ticdesk/static/sad-dolphin.png b/ticdesk/static/sad-dolphin.png
similarity index 100%
rename from aleksis/apps/ticdesk/static/sad-dolphin.png
rename to ticdesk/static/sad-dolphin.png
diff --git a/aleksis/apps/ticdesk/static/style.less b/ticdesk/static/style.less
similarity index 100%
rename from aleksis/apps/ticdesk/static/style.less
rename to ticdesk/static/style.less
diff --git a/aleksis/apps/ticdesk/tables.py b/ticdesk/tables.py
similarity index 100%
rename from aleksis/apps/ticdesk/tables.py
rename to ticdesk/tables.py
diff --git a/aleksis/apps/ticdesk/templates/templated_email/event_created.email b/ticdesk/templates/templated_email/event_created.email
similarity index 100%
rename from aleksis/apps/ticdesk/templates/templated_email/event_created.email
rename to ticdesk/templates/templated_email/event_created.email
diff --git a/aleksis/apps/ticdesk/templates/templated_email/event_registred.email b/ticdesk/templates/templated_email/event_registred.email
similarity index 100%
rename from aleksis/apps/ticdesk/templates/templated_email/event_registred.email
rename to ticdesk/templates/templated_email/event_registred.email
diff --git a/aleksis/apps/ticdesk/templates/ticdesk/event_registration/full.html b/ticdesk/templates/ticdesk/event_registration/full.html
similarity index 100%
rename from aleksis/apps/ticdesk/templates/ticdesk/event_registration/full.html
rename to ticdesk/templates/ticdesk/event_registration/full.html
diff --git a/aleksis/apps/ticdesk/templates/ticdesk/event_registration/list.html b/ticdesk/templates/ticdesk/event_registration/list.html
similarity index 100%
rename from aleksis/apps/ticdesk/templates/ticdesk/event_registration/list.html
rename to ticdesk/templates/ticdesk/event_registration/list.html
diff --git a/aleksis/apps/ticdesk/templates/ticdesk/feedback_aspect/edit.html b/ticdesk/templates/ticdesk/feedback_aspect/edit.html
similarity index 100%
rename from aleksis/apps/ticdesk/templates/ticdesk/feedback_aspect/edit.html
rename to ticdesk/templates/ticdesk/feedback_aspect/edit.html
diff --git a/aleksis/apps/ticdesk/templates/ticdesk/feedback_aspect/list.html b/ticdesk/templates/ticdesk/feedback_aspect/list.html
similarity index 100%
rename from aleksis/apps/ticdesk/templates/ticdesk/feedback_aspect/list.html
rename to ticdesk/templates/ticdesk/feedback_aspect/list.html
diff --git a/aleksis/apps/ticdesk/templates/ticdesk/print/corona.html b/ticdesk/templates/ticdesk/print/corona.html
similarity index 100%
rename from aleksis/apps/ticdesk/templates/ticdesk/print/corona.html
rename to ticdesk/templates/ticdesk/print/corona.html
diff --git a/aleksis/apps/ticdesk/templates/ticdesk/print/list_attendance.html b/ticdesk/templates/ticdesk/print/list_attendance.html
similarity index 100%
rename from aleksis/apps/ticdesk/templates/ticdesk/print/list_attendance.html
rename to ticdesk/templates/ticdesk/print/list_attendance.html
diff --git a/aleksis/apps/ticdesk/templates/ticdesk/print/list_participants.html b/ticdesk/templates/ticdesk/print/list_participants.html
similarity index 100%
rename from aleksis/apps/ticdesk/templates/ticdesk/print/list_participants.html
rename to ticdesk/templates/ticdesk/print/list_participants.html
diff --git a/aleksis/apps/ticdesk/templates/ticdesk/print/list_sign.html b/ticdesk/templates/ticdesk/print/list_sign.html
similarity index 100%
rename from aleksis/apps/ticdesk/templates/ticdesk/print/list_sign.html
rename to ticdesk/templates/ticdesk/print/list_sign.html
diff --git a/aleksis/apps/ticdesk/templates/ticdesk/print/manage.html b/ticdesk/templates/ticdesk/print/manage.html
similarity index 100%
rename from aleksis/apps/ticdesk/templates/ticdesk/print/manage.html
rename to ticdesk/templates/ticdesk/print/manage.html
diff --git a/aleksis/apps/ticdesk/templates/ticdesk/print/voucher.html b/ticdesk/templates/ticdesk/print/voucher.html
similarity index 100%
rename from aleksis/apps/ticdesk/templates/ticdesk/print/voucher.html
rename to ticdesk/templates/ticdesk/print/voucher.html
diff --git a/aleksis/apps/ticdesk/templates/ticdesk/teckids_event/edit.html b/ticdesk/templates/ticdesk/teckids_event/edit.html
similarity index 100%
rename from aleksis/apps/ticdesk/templates/ticdesk/teckids_event/edit.html
rename to ticdesk/templates/ticdesk/teckids_event/edit.html
diff --git a/aleksis/apps/ticdesk/templates/ticdesk/teckids_event/feedback.html b/ticdesk/templates/ticdesk/teckids_event/feedback.html
similarity index 100%
rename from aleksis/apps/ticdesk/templates/ticdesk/teckids_event/feedback.html
rename to ticdesk/templates/ticdesk/teckids_event/feedback.html
diff --git a/aleksis/apps/ticdesk/templates/ticdesk/teckids_event/list.html b/ticdesk/templates/ticdesk/teckids_event/list.html
similarity index 100%
rename from aleksis/apps/ticdesk/templates/ticdesk/teckids_event/list.html
rename to ticdesk/templates/ticdesk/teckids_event/list.html
diff --git a/aleksis/apps/ticdesk/templates/ticdesk/teckids_event/manage.html b/ticdesk/templates/ticdesk/teckids_event/manage.html
similarity index 100%
rename from aleksis/apps/ticdesk/templates/ticdesk/teckids_event/manage.html
rename to ticdesk/templates/ticdesk/teckids_event/manage.html
diff --git a/aleksis/apps/ticdesk/templates/ticdesk/teckids_event/register.html b/ticdesk/templates/ticdesk/teckids_event/register.html
similarity index 100%
rename from aleksis/apps/ticdesk/templates/ticdesk/teckids_event/register.html
rename to ticdesk/templates/ticdesk/teckids_event/register.html
diff --git a/aleksis/apps/ticdesk/templates/ticdesk/teckids_event/register_additional.html b/ticdesk/templates/ticdesk/teckids_event/register_additional.html
similarity index 100%
rename from aleksis/apps/ticdesk/templates/ticdesk/teckids_event/register_additional.html
rename to ticdesk/templates/ticdesk/teckids_event/register_additional.html
diff --git a/aleksis/apps/ticdesk/templates/ticdesk/teckids_member/edit.html b/ticdesk/templates/ticdesk/teckids_member/edit.html
similarity index 100%
rename from aleksis/apps/ticdesk/templates/ticdesk/teckids_member/edit.html
rename to ticdesk/templates/ticdesk/teckids_member/edit.html
diff --git a/aleksis/apps/ticdesk/templates/ticdesk/teckids_member/list.html b/ticdesk/templates/ticdesk/teckids_member/list.html
similarity index 100%
rename from aleksis/apps/ticdesk/templates/ticdesk/teckids_member/list.html
rename to ticdesk/templates/ticdesk/teckids_member/list.html
diff --git a/aleksis/apps/ticdesk/templates/ticdesk/voucher/edit.html b/ticdesk/templates/ticdesk/voucher/edit.html
similarity index 100%
rename from aleksis/apps/ticdesk/templates/ticdesk/voucher/edit.html
rename to ticdesk/templates/ticdesk/voucher/edit.html
diff --git a/aleksis/apps/ticdesk/templates/ticdesk/voucher/list.html b/ticdesk/templates/ticdesk/voucher/list.html
similarity index 100%
rename from aleksis/apps/ticdesk/templates/ticdesk/voucher/list.html
rename to ticdesk/templates/ticdesk/voucher/list.html
diff --git a/aleksis/apps/ticdesk/urls.py b/ticdesk/urls.py
similarity index 100%
rename from aleksis/apps/ticdesk/urls.py
rename to ticdesk/urls.py
diff --git a/aleksis/apps/ticdesk/util.py b/ticdesk/util.py
similarity index 100%
rename from aleksis/apps/ticdesk/util.py
rename to ticdesk/util.py
diff --git a/aleksis/apps/ticdesk/views.py b/ticdesk/views.py
similarity index 100%
rename from aleksis/apps/ticdesk/views.py
rename to ticdesk/views.py
--
GitLab