Skip to content
Snippets Groups Projects
Commit 0a750440 authored by Julian's avatar Julian
Browse files

Merge branch 'master' into 323-fix-circle-icons

parents 32ff6e25 6e36f7c2
No related branches found
No related tags found
1 merge request!400Resolve "Fix circle icons"
Pipeline #4959 passed
...@@ -116,7 +116,7 @@ INSTALLED_APPS = [ ...@@ -116,7 +116,7 @@ INSTALLED_APPS = [
"colorfield", "colorfield",
"django_bleach", "django_bleach",
"favicon", "favicon",
"django_filters" "django_filters",
] ]
merge_app_settings("INSTALLED_APPS", INSTALLED_APPS, True) merge_app_settings("INSTALLED_APPS", INSTALLED_APPS, True)
......
"""Management utilities for an AlekSIS installation."""
import os
import sys
from django.core.management import execute_from_command_line
def aleksis_cmd():
"""Run django-admin command with correct settings path."""
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "aleksis.core.settings")
execute_from_command_line(sys.argv)
...@@ -101,6 +101,9 @@ celery = ["Celery", "django-celery-results", "django-celery-beat", "django-celer ...@@ -101,6 +101,9 @@ celery = ["Celery", "django-celery-results", "django-celery-beat", "django-celer
[tool.poetry.dev-dependencies] [tool.poetry.dev-dependencies]
aleksis-builddeps = "*" aleksis-builddeps = "*"
[tool.poetry.scripts]
aleksis-admin = 'aleksis.core.util.manage:aleksis_cmd'
[tool.black] [tool.black]
line-length = 100 line-length = 100
exclude = "/migrations/" exclude = "/migrations/"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment