Merge remote-tracking branch 'origin' into release/2

Author: jlchilders11

coderedcms/migrations/0039_alter_classifierterm_slug.py

@@ -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",
+            ),
+        ),
+    ]

coderedcms/models/snippet_models.py

@@ -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,

docs/contributing/index.rst

@@ -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
@@ -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

docs/releases/index.rst

@@ -25,6 +25,7 @@ Supported Versions:
 .. toctree::
     :maxdepth: 1
 
+    v2.1.4
     v2.1.3
     v2.1.2
     v2.1.1

docs/releases/v2.1.4.rst

@@ -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>`_.