sanspie/akarpov
1
1
Fork 0
mirror of https://github.com/Alexander-D-Karpov/akarpov synced 2024-11-24 22:53:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dependabot/pip/django-anymail-10.0

Browse Source
This commit is contained in:
Alexander Karpov 2023-05-17 18:23:36 +03:00 committed by GitHub
commit 6291ba333d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
akarpov/templates/files/list.html
View File

@ -72,7 +72,7 @@
<svg class="upload_svg" width="60" height="60" aria-hidden="true">
<use href="#icon-imageUpload"></use>
</svg>
<p class="small my-2">Drag &amp; Drop file(s) <br><i>or</i></p>
<p class="small my-2">Drag &amp; Drop file(s) <small>({{ request.user.left_file_upload | filesizeformat }} left)</small><br><i>or</i></p>
<input class="position-absolute invisible" id="chunked_upload" type="file" name="the_file">
<label class="btn btn-upload mb-3" for="chunked_upload">Choose file(s)</label>
<div class="upload_gallery d-flex flex-wrap justify-content-center gap-3 mb-0"></div>

2
compose/local/django/Dockerfile
View File

@ -26,7 +26,7 @@ WORKDIR ${APP_HOME}
RUN apt-get update && \
apt-get install -y build-essential libpq-dev gettext libmagic-dev libjpeg-dev zlib1g-dev && \
# Dependencies for file preview generation
apt-get install -y webp libimage-exiftool-perl libmagickwand-dev ffmpeg && \
apt-get install -y webp libimage-exiftool-perl libmagickwand-dev ffmpeg libgdal-dev && \
apt-get purge -y --auto-remove -o APT:AutoRemove:RecommendsImportant=false && \
rm -rf /var/lib/apt/lists/*

14
poetry.lock generated
View File

@ -1240,14 +1240,14 @@ files = [
[[package]]
name = "django"
version = "4.2"
version = "4.2.1"
description = "A high-level Python web framework that encourages rapid development and clean, pragmatic design."
category = "main"
optional = false
python-versions = ">=3.8"
files = [
{file = "Django-4.2-py3-none-any.whl", hash = "sha256:ad33ed68db9398f5dfb33282704925bce044bef4261cd4fb59e4e7f9ae505a78"},
{file = "Django-4.2.tar.gz", hash = "sha256:c36e2ab12824e2ac36afa8b2515a70c53c7742f0d6eaefa7311ec379558db997"},
{file = "Django-4.2.1-py3-none-any.whl", hash = "sha256:066b6debb5ac335458d2a713ed995570536c8b59a580005acb0732378d5eb1ee"},
{file = "Django-4.2.1.tar.gz", hash = "sha256:7efa6b1f781a6119a10ac94b4794ded90db8accbe7802281cd26f8664ffed59c"},
]
[package.dependencies]
@ -1705,14 +1705,14 @@ files = [
[[package]]
name = "django-sekizai"
version = "4.0.0"
version = "4.1.0"
description = "Django Sekizai"
category = "main"
optional = false
python-versions = ">=3.8"
files = [
{file = "django-sekizai-4.0.0.tar.gz", hash = "sha256:3304732a8da09e311df0f851185c9b2d57867126f2c73f00326f57d0ffbc2d68"},
{file = "django_sekizai-4.0.0-py3-none-any.whl", hash = "sha256:98ec08acf2670d441cf0f57ec0a3623f3e2e1a75a61735dec53162016f041284"},
{file = "django-sekizai-4.1.0.tar.gz", hash = "sha256:2aca36cbae0b5c0cefed9565416ec442335767fb3145bff11e58622fc653cdad"},
{file = "django_sekizai-4.1.0-py3-none-any.whl", hash = "sha256:aa12e66ba0335fbe726b7d74cf4e8716b89a0be99a1304a9b9e8b191229e2e4a"},
]
[package.dependencies]
@ -5709,4 +5709,4 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"]
[metadata]
lock-version = "2.0"
python-versions = "^3.11"
content-hash = "e26f9b79098dd283c320d61e306ffc1b81fbb42bff4cb11578bd4ae4db0473c1"
content-hash = "e26f9b79098dd283c320d61e306ffc1b81fbb42bff4cb11578bd4ae4db0473c1"

2
pyproject.toml
View File

@ -64,7 +64,7 @@ django-cacheops = "^6.1"
django-extra-settings = "^0.9.1"
psycopg2-binary = "^2.9.5"
django-cms = "^3.11.1"
django-sekizai = "^4.0.0"
django-sekizai = "^4.1.0"
amzqr = "^0.0.1"
django-active-link = "^0.1.8"
channels = {extras = ["daphne"], version = "^4.0.0"}