Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into release/2
Browse files Browse the repository at this point in the history
  • Loading branch information
jlchilders11 committed Jul 20, 2023
2 parents f25d1a3 + 948f546 commit 7b169c7
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 7 deletions.
22 changes: 22 additions & 0 deletions coderedcms/migrations/0039_alter_classifierterm_slug.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Generated by Django 4.1.10 on 2023-07-13 19:18

from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("coderedcms", "0038_alter_classifier_slug"),
]

operations = [
migrations.AlterField(
model_name="classifierterm",
name="slug",
field=models.SlugField(
allow_unicode=True,
max_length=255,
unique=True,
verbose_name="Slug",
),
),
]
1 change: 1 addition & 0 deletions coderedcms/models/snippet_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ class Meta(Orderable.Meta):
allow_unicode=True,
unique=True,
verbose_name=_("Slug"),
max_length=255,
)
name = models.CharField(
max_length=255,
Expand Down
15 changes: 8 additions & 7 deletions docs/contributing/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -303,20 +303,20 @@ Updating Tutorial Documentation
-------------------------------

From time to time, the documentation for the tutorial will need to be updated. You can work directly in
the tutorial site by loading the fixture file for its database (read more at :ref:`load-data`).
the tutorial site by loading the fixture file for its database (read more at :ref:`load-data`).

However, once you have worked in the tutorial site and gotten new screenshots for the **Getting Started** documentation,
you will also need to update the fixture file, which is located in ``tutorial > mysite > website > fixtures``.
you will also need to update the fixture file, which is located in ``tutorial > mysite > website > fixtures``.

**These are the steps for updating the fixture:**

1. From the command line, type ``python manage.py dumpdata --natural-foreign --natural-primary -e contenttypes -e auth.Permission --indent 4 > dumpdata.json``

2. The dumped data file will show up in the ``website`` folder. Open it and copy/paste its contents into a new file called ``database.json``. This will fix the encoding issue you would run into otherwise. Save the new fixture file and delete the one that was dumped. Also delete the one that is currently in the ``fixtures`` folder.

3. Move the ``database.json`` file into the ``fixtures`` folder.
3. Move the ``database.json`` file into the ``fixtures`` folder.

4. For testing ``loaddata``, please review the steps at :ref:`load-data`.
4. For testing ``loaddata``, please review the steps at :ref:`load-data`.


Publishing a New Release
Expand Down Expand Up @@ -349,10 +349,11 @@ Finally build and update docs:
$ ./ci/make-docs.ps1
If updating docs for an existing major version release:
Copy the contents of ``docs/_build/html/`` to the CodeRed docs server under the existing version directory. Using the ``cr`` tool:

#. Copy the contents of ``docs/_build/html/`` to the CodeRed docs server under
the existing version directory.
.. code-block:: console
$ cr upload --path ./docs/_build/html/ --remote /www/wagtail-crx/ docs
Note that we do not release separate documentation versions for minor or
maintenance releases. Update the existing major version docs with release notes
Expand Down
1 change: 1 addition & 0 deletions docs/releases/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Supported Versions:
.. toctree::
:maxdepth: 1

v2.1.4
v2.1.3
v2.1.2
v2.1.1
Expand Down
12 changes: 12 additions & 0 deletions docs/releases/v2.1.4.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
v2.1.4 release notes
====================

Bug fixes:

* Fix bug creating ClassifierTerm when name is over 50 characters.


Thank you!
----------

Thanks to everyone who contributed to `2.1.4 on GitHub <https://github.com/coderedcorp/coderedcms/milestone/49?closed=1>`_.

0 comments on commit 7b169c7

Please sign in to comment.