Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-Core
Commits
4adfae49
Verified
Commit
4adfae49
authored
3 years ago
by
Nik | Klampfradler
Browse files
Options
Downloads
Patches
Plain Diff
Re-introduce django-image-cropping
parent
9a8e2d8d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!809
Resolve "Add avatar field to Person and Group"
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
aleksis/core/settings.py
+7
-0
7 additions, 0 deletions
aleksis/core/settings.py
poetry.lock
+1419
-73
1419 additions, 73 deletions
poetry.lock
pyproject.toml
+2
-0
2 additions, 0 deletions
pyproject.toml
with
1428 additions
and
73 deletions
aleksis/core/settings.py
+
7
−
0
View file @
4adfae49
...
...
@@ -5,6 +5,7 @@ from socket import getfqdn
from
django.utils.translation
import
gettext_lazy
as
_
from
dynaconf
import
LazySettings
from
easy_thumbnails.conf
import
Settings
as
thumbnail_settings
from
.util.core_helpers
import
get_app_packages
,
merge_app_settings
,
monkey_patch
...
...
@@ -141,6 +142,8 @@ INSTALLED_APPS = [
"
django_filters
"
,
"
oauth2_provider
"
,
"
rest_framework
"
,
"
easy_thumbnails
"
,
"
image_cropping
"
,
]
merge_app_settings
(
"
INSTALLED_APPS
"
,
INSTALLED_APPS
,
True
)
...
...
@@ -921,5 +924,9 @@ if SENTRY_ENABLED:
**
SENTRY_SETTINGS
,
)
THUMBNAIL_PROCESSORS
=
(
"
image_cropping.thumbnail_processors.crop_corners
"
,
)
+
thumbnail_settings
.
THUMBNAIL_PROCESSORS
# Add django-cleanup after all apps to ensure that it gets all signals as last app
INSTALLED_APPS
.
append
(
"
django_cleanup.apps.CleanupConfig
"
)
This diff is collapsed.
Click to expand it.
poetry.lock
+
1419
−
73
View file @
4adfae49
This diff is collapsed.
Click to expand it.
pyproject.toml
+
2
−
0
View file @
4adfae49
...
...
@@ -114,6 +114,8 @@ django-titofisto = "^0.2.0"
haystack-redis
=
"^0.0.1"
python-gnupg
=
"^0.4.7"
sentry-sdk
=
{
version
=
"^1.4.3"
,
optional
=
true
}
django-image-cropping
=
"^1.6.1"
easy-thumbnails
=
"^2.8"
[
tool.poetry.extras
]
ldap
=
[
"django-auth-ldap"
]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment