Skip to content

Commit

Permalink
Merge pull request #81 from PiotrIw/fix_image
Browse files Browse the repository at this point in the history
v1.2.09 update
  • Loading branch information
PiotrIw authored Apr 22, 2024
2 parents 86838aa + 1e2cfb0 commit 26ac74a
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 14 deletions.
1 change: 0 additions & 1 deletion config/settings/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@
EMAIL_SUBJECT_PREFIX = env.str("DJANGO_EMAIL_SUBJECT_PREFIX", "[poradnia] ")
EMAIL_USE_TLS = env.bool("DJANGO_EMAIL_USE_TLS", True)
SERVER_EMAIL = env.str("DJANGO_SERVER_EMAIL", "")
# SERVER_EMAIL = EMAIL_HOST_USER
# END EMAIL

# MANAGER CONFIGURATION
Expand Down
12 changes: 0 additions & 12 deletions config/settings/production.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,6 @@
SECRET_KEY = env.str("DJANGO_SECRET_KEY")
# END SECRET KEY

# # EMAIL
# DEFAULT_FROM_EMAIL = env.str(
# "DJANGO_DEFAULT_FROM_EMAIL", "poradnia <[email protected]>"
# )
# EMAIL_SUBJECT_PREFIX = env.str("DJANGO_EMAIL_SUBJECT_PREFIX", "[poradnia] ")

# EMAIL_CONFIG = env.email_url("EMAIL_URL", default="smtp://localhost:25")
# vars().update(EMAIL_CONFIG)

# SERVER_EMAIL = env.str("DJANGO_SERVER_EMAIL")
# # END EMAIL

# TEMPLATE CONFIGURATION
# See: https://docs.djangoproject.com/en/dev/ref/settings/#template-dirs
TEMPLATES[0]["OPTIONS"]["loaders"] = (
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ lxml==5.2.1
cssselect==1.2.0
# Your custom requirements go here
django-guardian==2.4.0
django-mailbox==4.10.0
django-mailbox==4.10.1
django-filter==24.2
# django-ajax-datatable to be installed from github fork until
# https://github.com/morlandi/django-ajax-datatable/pull/111 is merged
Expand Down

0 comments on commit 26ac74a

Please sign in to comment.