Skip to content

Commit 0abe9af

Browse files
committed
Merge branch 'master' into finder
2 parents c9adf86 + 9c9d0d0 commit 0abe9af

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+2820
-1674
lines changed

.github/workflows/docs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
name: docs
99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@v2
11+
uses: actions/checkout@v5
1212
- name: Set up Python
13-
uses: actions/setup-python@v2
13+
uses: actions/setup-python@v5
1414
with:
15-
python-version: 3.9
15+
python-version: 3.12
1616
- run: python -m pip install -r docs/requirements.txt
1717
- name: Build docs
1818
run: |

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
with:
1515
python-version: 3.9
1616
- name: Install flake8
17-
run: pip install --upgrade flake8
17+
run: pip install --upgrade flake8 flake8-pyproject
1818
- name: Run flake8
1919
uses: liskin/gh-problem-matcher-wrap@v1
2020
with:

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
24

.pre-commit-config.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@ repos:
2424
rev: 7.0.0
2525
hooks:
2626
- id: flake8
27-
27+
entry: pflake8
28+
additional_dependencies: [pyproject-flake8]
2829
- repo: https://github.com/asottile/yesqa
2930
rev: v1.5.0
3031
hooks:
3132
- id: yesqa
3233

3334
- repo: https://github.com/pre-commit/pre-commit-hooks
34-
rev: v4.6.0
35+
rev: v6.0.0
3536
hooks:
3637
- id: check-merge-conflict
3738
- id: mixed-line-ending

CHANGELOG.rst

Lines changed: 88 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,99 @@
22
CHANGELOG
33
=========
44

5-
3.2 (2025-05-21)
6-
================
7-
* Fix: Reverse match for 'filer_image_expand_view' not found.
8-
* Drop support for Python 3.8 and 3.9.
9-
* Add support for Python 3.12.
5+
3.3.3 / 2025-11-07
6+
==================
7+
8+
* Pin svglib to a version below 1.6.0 by @payamnj (#1550) in https://github.com/django-cms/django-filer/pull/1551
9+
10+
3.3.2 (2025-09-01)
11+
==================
12+
13+
* fix: add filename length safety check with random suffix by @Baraff24 in https://github.com/django-cms/django-filer/pull/1515
14+
* fix: Remove user from autocomplete fields if (swapped) user model does not have search fields by @fsbraun in https://github.com/django-cms/django-filer/pull/1517
15+
* Fix: Include Private Storage in Orphan File Scanning for filer_check Command by @Baraff24 in https://github.com/django-cms/django-filer/pull/1518
16+
* fix: Relect template block structure of Django 5.2+ by @fsbraun in https://github.com/django-cms/django-filer/pull/1523
17+
* chore: Added Full Persian (Farsi) Translate by @dimacodev in https://github.com/django-cms/django-filer/pull/1524
18+
* fix: Update directory_table_list.html by @AliAkbarSobhanpoor in https://github.com/django-cms/django-filer/pull/1528
19+
* fix: Avoid locale-dependent ratio by @albanbochsler in https://github.com/django-cms/django-filer/pull/1536
20+
* fix: docs GitHub action built by @fsbraun in https://github.com/django-cms/django-filer/pull/1540
21+
* fix: Folder permission cache update sometimes raised TypeError by @fsbraun in https://github.com/django-cms/django-filer/pull/1539
22+
* fix: Failed to install submodules of filer by @fsbraun in https://github.com/django-cms/django-filer/pull/1544
23+
24+
**New Contributors**
25+
26+
* @Baraff24 made their first contribution in https://github.com/django-cms/django-filer/pull/1515
27+
* @dimacodev made their first contribution in https://github.com/django-cms/django-filer/pull/1524
28+
* @AliAkbarSobhanpoor made their first contribution in https://github.com/django-cms/django-filer/pull/1528
29+
* @albanbochsler made their first contribution in https://github.com/django-cms/django-filer/pull/1536
30+
31+
3.3.1 (2024-12-07)
32+
==================
33+
34+
* fix: editing buttons missing in admin when file present by @pajowu in https://github.com/django-cms/django-filer/pull/1511
35+
* fix: incompatibility with djangocms-versioning-filer 1.3 was fixed by @fscherf in https://github.com/django-cms/django-filer/pull/1509
36+
37+
**New Contributors**
38+
39+
* @pajowu made their first contribution in https://github.com/django-cms/django-filer/pull/1511
40+
* @fscherf made their first contribution in https://github.com/django-cms/django-filer/pull/1509
41+
42+
3.3.0 (2024-11-19)
43+
==================
44+
45+
* fix: Restrict upload of binary or unknown file types by default by @fsbraun in https://github.com/django-cms/django-filer/pull/1507
46+
* fix: remove extra brace in generated HTML of data-max-filesize attribute by @fabien-michel in https://github.com/django-cms/django-filer/pull/1502
47+
* fix: uploadButton data-max-filesize attribute is not passed to file-uploader by @fabien-michel in https://github.com/django-cms/django-filer/pull/1503
48+
* docs: Update for on_delete requirement in Filer fields
49+
50+
3.2.3 (2024-09-18)
51+
==================
52+
53+
* fix: Use TypeVar for type-hinting of the user parameter by @payamnj in https://github.com/django-cms/django-filer/pull/1496
54+
55+
** New contributor**
56+
57+
* @payamnj made their first contribution in https://github.com/django-cms/django-filer/pull/1496
58+
59+
60+
3.2.2 (2024-09-09)
61+
==================
62+
63+
* fix: Remove version pin to Django<5.1
64+
65+
3.2.1 (2024-09-05)
66+
==================
67+
68+
* fix: Restore python 3.8 and python 3.9 compatibility
69+
70+
3.2.0 (2024-08-23)
71+
==================
72+
73+
* feat: Add cache for permission checks by @fsbraun in https://github.com/django-cms/django-filer/pull/1486
74+
* fix: Reduce number of thumbnails created for admin, avoid admin thumbnails for svg files by @fsbraun in https://github.com/django-cms/django-filer/pull/1490
75+
* fix: Allow ``Image.MAX_IMAGE_PIXELS`` to be ``None`` by @fsbraun in https://github.com/django-cms/django-filer/pull/1475
76+
* docs: Update extending_filer.rst by @DmytroLitvinov in https://github.com/django-cms/django-filer/pull/1488
77+
78+
**New contributor:**
79+
80+
* @DmytroLitvinov made their first contribution in https://github.com/django-cms/django-filer/pull/1488
81+
82+
3.1.4 (2024-07-15)
83+
==================
84+
85+
* feat: Accept new `STORAGES` setting, introduced in Django 4.2 by @fsbraun in https://github.com/django-cms/django-filer/pull/1472
86+
* feat: Replace `render` with `TemplateResponse` in admin views by @fsbraun in https://github.com/django-cms/django-filer/pull/1473
87+
* fix: File expand url incorrect and worked not with custom image models by @fsbraun in https://github.com/django-cms/django-filer/pull/1471
88+
* fix: Crash when moving files from a filtered directory listing by @W1ldPo1nter in https://github.com/django-cms/django-filer/pull/1482
89+
* ci: pre-commit autoupdate by @pre-commit-ci in https://github.com/django-cms/django-filer/pull/1477
1090

1191

12-
3.1.3 (2025-05-17)
92+
3.1.3 (2024-05-17)
1393
==================
1494
* Fix: Folder select widget did not render correctly with standard Django admin
1595
styles.
1696

17-
3.1.2 (2025-05-17)
97+
3.1.2 (2024-05-17)
1898
==================
1999

20100
* Made the filer check command compatible with custom image models.
@@ -719,7 +799,7 @@ CHANGELOG
719799

720800

721801
0.5.4a1
722-
=======
802+
========
723803

724804
* Adds description field.
725805

MANIFEST.in

Lines changed: 0 additions & 7 deletions
This file was deleted.

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ for all the details on how to install, configure and use django-filer.
5454
:target: http://badge.fury.io/py/django-filer
5555
.. |coverage| image:: https://codecov.io/gh/django-cms/django-filer/branch/master/graph/badge.svg
5656
:target: https://codecov.io/gh/django-cms/django-filer
57-
.. |python| image:: https://img.shields.io/badge/python-3.8+-blue.svg
57+
.. |python| image:: https://img.shields.io/badge/python-3.10+-blue.svg
5858
:target: https://pypi.org/project/django-filer/
5959
.. |django| image:: https://img.shields.io/badge/django-3.2+-blue.svg
6060
:target: https://www.djangoproject.com/

docs/conf.py

Lines changed: 34 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import sys
1616

1717

18-
sys.path.append(os.path.abspath('../'))
18+
sys.path.append(os.path.abspath("../"))
1919

2020
from filer import __version__ # NOQA
2121

@@ -33,38 +33,38 @@
3333
# Add any Sphinx extension module names here, as strings. They can be extensions
3434
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
3535
extensions = [
36-
'sphinx.ext.autodoc',
37-
'sphinx.ext.doctest',
38-
'sphinx.ext.intersphinx',
39-
'sphinx.ext.todo',
40-
'sphinxcontrib.spelling',
36+
"sphinx.ext.autodoc",
37+
"sphinx.ext.doctest",
38+
"sphinx.ext.intersphinx",
39+
"sphinx.ext.todo",
40+
"sphinxcontrib.spelling",
4141
"sphinx_copybutton",
4242
"sphinxext.opengraph",
43-
'sphinxcontrib.images',
43+
"sphinxcontrib.images",
4444
]
4545

4646
# Add any paths that contain templates here, relative to this directory.
47-
templates_path = ['_templates']
47+
templates_path = ["_templates"]
4848

4949
# The suffix of source filenames.
50-
source_suffix = '.rst'
50+
source_suffix = ".rst"
5151

5252
# The encoding of source files.
5353
# source_encoding = 'utf-8-sig'
5454

5555
# The master toctree document.
56-
master_doc = 'index'
56+
master_doc = "index"
5757

5858
# General information about the project.
59-
project = 'django-filer'
60-
copyright = '%s, Stefan Foulis' % (datetime.date.today().year,)
59+
project = "django-filer"
60+
copyright = "%s, Stefan Foulis" % (datetime.date.today().year,)
6161

6262
# The version info for the project you're documenting, acts as replacement for
6363
# |version| and |release|, also used in various other places throughout the
6464
# built documents.
6565
#
6666
# The short X.Y version.
67-
version = '.'.join(__version__.split('.')[0:2])
67+
version = ".".join(__version__.split(".")[:2])
6868
# The full version, including alpha/beta/rc tags.
6969
release = __version__
7070

@@ -80,7 +80,7 @@
8080

8181
# List of patterns, relative to source directory, that match files and
8282
# directories to ignore when looking for source files.
83-
exclude_patterns = ['_build', '_images', 'README.rst']
83+
exclude_patterns = ["_build", "_images", "README.rst"]
8484

8585
# The reST default role (used for this markup: `text`) to use for all documents.
8686
# default_role = None
@@ -97,7 +97,7 @@
9797
# show_authors = False
9898

9999
# The name of the Pygments (syntax highlighting) style to use.
100-
pygments_style = 'sphinx'
100+
pygments_style = "sphinx"
101101

102102
# A list of ignored prefixes for module index sorting.
103103
# modindex_common_prefix = []
@@ -107,7 +107,7 @@
107107

108108
# The theme to use for HTML and HTML Help pages. See the documentation for
109109
# a list of builtin themes.
110-
html_theme = 'furo'
110+
html_theme = "furo"
111111

112112
# Theme options are theme-specific and customize the look and feel of a theme
113113
# further. For a list of options available for each theme, see the
@@ -138,7 +138,7 @@
138138
# Add any paths that contain custom static files (such as style sheets) here,
139139
# relative to this directory. They are copied after the builtin static files,
140140
# so a file named "default.css" will overwrite the builtin "default.css".
141-
html_static_path = ['_static']
141+
html_static_path = ["_static"]
142142

143143
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
144144
# using the given strftime format.
@@ -182,7 +182,7 @@
182182
# html_file_suffix = ''
183183

184184
# Output file base name for HTML help builder.
185-
htmlhelp_basename = 'django-filerdoc'
185+
htmlhelp_basename = "django-filerdoc"
186186

187187

188188
# -- Options for LaTeX output --------------------------------------------------
@@ -196,7 +196,13 @@
196196
# Grouping the document tree into LaTeX files. List of tuples
197197
# (source start file, target name, title, author, documentclass [howto/manual]).
198198
latex_documents = [
199-
('index', 'django-filer.tex', 'django-filer Documentation', 'Stefan Foulis', 'manual'),
199+
(
200+
"index",
201+
"django-filer.tex",
202+
"django-filer Documentation",
203+
"Stefan Foulis",
204+
"manual",
205+
),
200206
]
201207

202208
# The name of an image file (relative to this directory) to place at the top of
@@ -228,13 +234,19 @@
228234
# One entry per manual page. List of tuples
229235
# (source start file, name, description, authors, manual section).
230236
man_pages = [
231-
('index', 'django-filer', 'django-filer Documentation', ['Stefan Foulis'], 1)
237+
("index", "django-filer", "django-filer Documentation", ["Stefan Foulis"], 1)
232238
]
233239

234240

235241
# Example configuration for intersphinx: refer to the Python standard library.
236-
intersphinx_mapping = {'http://docs.python.org/': None}
242+
intersphinx_mapping = {
243+
"python": ("https://docs.python.org/3", None),
244+
"django": (
245+
"https://docs.djangoproject.com/en/stable/",
246+
"https://docs.djangoproject.com/en/stable/objects.inv",
247+
),
248+
}
237249

238250
images_config = {
239-
'override_image_directive': True,
251+
"override_image_directive": True,
240252
}

docs/extending_filer.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ field. You can override this behavior by subclassing the
214214
You can also override the search behavior for :py:class:`Folders<filer.models.foldermodels.Folder>`.
215215
Just override :py:attr:`~filer.admin.folderadmin.FolderAdmin.search_fields` by subclassing
216216
the :py:class:`filer.admin.folderadmin.FolderAdmin`. It works as described in
217-
`Django's docs <https://docs.djangoproject.com/en/1.8/ref/contrib/admin/#django.contrib.admin.ModelAdmin.search_fields>`_. E.g.:
217+
`Django's docs <https://docs.djangoproject.com/en/4.2/ref/contrib/admin/#django.contrib.admin.ModelAdmin.search_fields>`_. E.g.:
218218

219219

220220
.. code-block:: python
@@ -230,7 +230,7 @@ Providing custom Image model
230230
----------------------------
231231

232232
As the ``Image`` model is special, a different way to implement custom Image model is required, which uses the Django
233-
`swappable models <https://docs.djangoproject.com/en/2.0/topics/auth/customizing/#substituting-a-custom-user-model>`_ interface.
233+
`swappable models <https://docs.djangoproject.com/en/4.2/topics/auth/customizing/#substituting-a-custom-user-model>`_ interface.
234234

235235
Defining the model
236236
..................

docs/requirements.in

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
django>=4.2,<5
2+
furo
3+
restructuredtext-lint
4+
sphinx<8
5+
sphinx-autobuild
6+
sphinx-copybutton
7+
sphinxcontrib-images
8+
sphinxcontrib-spelling
9+
sphinxcontrib-inlinesyntaxhighlight
10+
sphinxext-opengraph
11+
pip-tools

0 commit comments

Comments
 (0)