10000 ci: Merge `develop` into `release/3.11.x` by fsbraun · Pull Request #7785 · django-cms/django-cms · GitHub
[go: up one dir, main page]

Skip to content

ci: Merge develop into release/3.11.x #7785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 35 commits into from
Jan 26, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
61a7367
ci: Merge back release 3.11.4 into `develop` (#7646)
fsbraun Sep 18, 2023
33847dc
fix: data-theme typo for 'auto' (#7649)
weber-s Sep 19, 2023
cb697e3
Create SECURITY.md (#7652)
marksweb Sep 21, 2023
caef9f3
docs: Writing an extensive docstring for view _clean_redirect_url in …
MidnightRoam Sep 22, 2023
4643353
Merge branch 'django-cms:develop' into develop
fsbraun Oct 16, 2023
bafe901
build: bump pillow from 9.3.0 to 10.0.1 in /test_requirements (#7660)
dependabot[bot] Oct 16, 2023
315340f
fix: change language url parameter to delete_language to prevent coll…
halitcelik Oct 17, 2023
7693883
feat: Add Python3.12 support (#7675)
Oct 17, 2023
f5292d1
fix: preserve `view_class` in decorated views (#7664)
Will-Hoey Oct 18, 2023
3576391
Bugfix: avoid InvalidCacheKey (memcached) for key-length ~249 (fixes …
wfehr Oct 19, 2023
a147dcb
Merge branch 'django-cms:develop' into develop
fsbraun Oct 23, 2023
159b49b
Update transifex pull strings script to first filter changes and THEN…
fsbraun Oct 23, 2023
0010b67
Merge branch 'django-cms:develop' into develop
fsbraun Nov 16, 2023
f7121be
fix: Use correct version of Django in GitHub CI actions (#7696)
fsbraun Nov 20, 2023
98d52d4
Merge branch 'django-cms:develop' into develop
fsbraun Nov 20, 2023
239dbf5
docs: Remove outdated link to djangocms-installer from docs (#7697)
fsbraun Nov 21, 2023
56b38d0
Update config.yml (#7701)
fsbraun Nov 22, 2023
a11a9d2
Merge branch 'django-cms:develop' into develop
fsbraun Nov 23, 2023
720a24c
Remove discontinued discourse server from docs (#7703)
fsbraun Nov 26, 2023
bb208af
build: bump browserify-sign from 4.2.1 to 4.2.2 (#7687)
dependabot[bot] Nov 29, 2023
7bbd10b
update certifi 2022.12.07 to 2023.7.22 (#7661)
realize096 Nov 29, 2023
70efd5f
Merge branch 'django-cms:develop' into develop
fsbraun Nov 30, 2023
04eaeaf
Add template-based install to django CMS v3 docs (#7709)
fsbraun Dec 4, 2023
63b614d
Restore overwrttten release notes (#7711)
fsbraun Dec 5, 2023
6e5bef7
Merge branch 'django-cms:develop' into develop
fsbraun Dec 7, 2023
6310a9b
Update docs for frontend testing (#7726)
protoroto Dec 21, 2023
0950714
feat: django 5 support for cms 3.11 (#7724)
protoroto Dec 21, 2023
20751e8
Update documentation CMS_CACHE_PREFIX default value (#7727)
protoroto Dec 22, 2023
32c2541
Merge branch 'django-cms:develop' into develop
fsbraun Jan 2, 2024
e12e26d
build: bump follow-redirects from 1.15.2 to 1.15.4 (#7749)
dependabot[bot] Jan 10, 2024
fc18e26
build: bump axios and browser-sync (#7751)
dependabot[bot] Jan 10, 2024
40fa8d9
fix: Add `--fix-paths` option to `./manage.py cms fix-tree` (#7744)
fsbraun Jan 14, 2024
0376a2f
feat: Add bot to remind to not squash merges into release/* branches …
fsbraun Jan 17, 2024
d90b23d
fix: readable messages in dark-mode (#7739)
fsbraun Jan 26, 2024
b12558d
Merge branch 'django-cms:develop' into develop
fsbraun Jan 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
docs: Remove outdated link to djangocms-installer from docs (#7697)
* Remove outdated link to djangocms-installer from docs

* More mentions
  • Loading branch information
fsbraun authored Nov 21, 2023
commit 239dbf5d995bf3275db1dffe9eb55649e2a4a84a
15 changes: 11 additions & 4 deletions docs/how_to/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
How to install django CMS by hand
#################################

The easiest way to install django CMS is by using the automated `django CMS installer
<https://github.com/nephila/djangocms-installer>`_. This is the recommended way to start with new projects, and it's
The easiest way to install django CMS is by using the automated `django CMS quckstart
<https://github.com/django-cms/django-cms-quickstart>`_ project. This is the
recommended way to start with (docker-based) new projects, and it's
what we use in the :ref:`tutorial section of this documentation <tutorials>`.

If you prefer to do things manually, this how-to guide will take you through the process.
Expand Down Expand Up @@ -211,7 +212,7 @@ Sekizai
=======

`Django Sekizai <https://github.com/ojii/django-sekizai>`_ is required by the CMS for static files management. You need
to have ``'sekizai'`` listed in ``INSTALLED_APPS``,
to have ``'sekizai'`` listed in ``INSTALLED_APPS``,

.. code-block:: python

Expand All @@ -232,12 +233,18 @@ and ``'sekizai.context_processors.sekizai'`` in the ``TEMPLATES['OPTIONS']['cont
'OPTIONS': {
'context_processors': [
...
'django.template.context_processors.i18n',
'sekizai.context_processors.sekizai',
],
},
},
]

.. note::

``django.template.context_processors.i18n`` is needed for the
wizards to work properly.


Middleware
==========
Expand Down Expand Up @@ -543,7 +550,7 @@ Next steps
**********

The :ref:`tutorials for developers <tutorials>` will help you understand how to approach django CMS as a developer.
Note that the tutorials assume you have installed the CMS using the django CMS Installer, but with a little
Note that the tutorials assume you have installed the CMS using the django CMS Quistart project, but with a little
adaptation you'll be able to use it as a basis.

To deploy your django CMS project on a production web server, please refer to the :doc:`Django deployment documentation
Expand Down
2 changes: 1 addition & 1 deletion docs/how_to/languages.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
How to serve multiple languages
###############################

If you used the `django CMS installer <https://github.com/nephila/djangocms-installer>`_ to start your project, you'll find
If you used `django CMS quickstart <https://github.com/django-cms/django-cms-quickstart>`_ to start your project, you'll find
that it's already set up for serving multilingual content. Our :ref:`installation` guide also does the same.

This guide specifically describes the steps required to enable multilingual support, in case you need to it manually.
Expand Down
2 changes: 1 addition & 1 deletion docs/introduction/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ in the order presented here.
09-third_party

If you want to install django CMS into an existing project, or prefer to configure django CMS by
hand, rather than using the automated installer, see :doc:`/how_to/install` and then follow the
hand, rather than using the quickstart project, see :doc:`/how_to/install` and then follow the
rest of the tutorials.

Either way, you'll be able to find support and help from the numerous friendly members of the
Expand Down
6 changes: 3 additions & 3 deletions docs/topics/commonly_used_plugins.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ that has been created.
django CMS Core Addons
**********************

We maintain a set of *Core Addons* for django CMS.
We maintain a set of *Core Addons* for django CMS.

You don't need to use them, and for many of them alternatives exist, but they represent a good way
to get started with a reliable project set-up. We recommend them for new users of django CMS in
particular. For example, if you start a project on `Divio Cloud <https://divio.com/>`_ or using the
`django CMS installer <https://github.com/nephila/djangocms-installer>`_, this is the set of addons
`django CMS quickstart <https://github.com/django-cms/django-cms-quickstart>`_, this is the set of addons
you'll have installed by default.

The django CMS Core Addons are:
Expand Down Expand Up @@ -82,7 +82,7 @@ Deprecated addons
Some older plugins that you may have encountered are now deprecated and we advise against
incorporating them into new projects.

These are:
These are:

* `cmsplugin-filer <https://github.com/divio/cmsplugin-filer>`_
* `Aldryn Style <https://github.com/aldryn/aldryn-style>`_
Expand Down
0