Merge branch 'master' into ghost_api_update

civictechprojects/migrations/0063_alter_taggedcategory_tag_and_more.py

@@ -0,0 +1,105 @@
+# Generated by Django 4.2 on 2023-06-20 03:42
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("taggit", "0003_taggeditem_add_unique_index"),
+        ("civictechprojects", "0062_auto_20230112_0100"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="taggedcategory",
+            name="tag",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="%(app_label)s_%(class)s_items",
+                to="taggit.tag",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="taggedeventorganization",
+            name="tag",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="%(app_label)s_%(class)s_items",
+                to="taggit.tag",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="taggedissueareas",
+            name="tag",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="%(app_label)s_%(class)s_items",
+                to="taggit.tag",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="taggedorganization",
+            name="tag",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="%(app_label)s_%(class)s_items",
+                to="taggit.tag",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="taggedorganizationtype",
+            name="tag",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="%(app_label)s_%(class)s_items",
+                to="taggit.tag",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="taggedpositionrole",
+            name="tag",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="%(app_label)s_%(class)s_items",
+                to="taggit.tag",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="taggedrsvpvolunteerrole",
+            name="tag",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="%(app_label)s_%(class)s_items",
+                to="taggit.tag",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="taggedstage",
+            name="tag",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="%(app_label)s_%(class)s_items",
+                to="taggit.tag",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="taggedtechnologies",
+            name="tag",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="%(app_label)s_%(class)s_items",
+                to="taggit.tag",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="taggedvolunteerrole",
+            name="tag",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="%(app_label)s_%(class)s_items",
+                to="taggit.tag",
+            ),
+        ),
+    ]

civictechprojects/views.py

@@ -983,8 +983,6 @@ def dismiss_project_volunteer(request, application_id):
         body = json.loads(request.body)
         message = body['dismissal_message']
         email_template = HtmlEmailTemplate()\
-        .paragraph('The owner of {project_name} has removed you from the project for the following reason:'.format(
-            project_name=volunteer_relation.project.project_name))\
         .paragraph('Thank you for contributing to {project_name}. Your volunteer work for the project has ended. \"{message}\"'\
                    .format(project_name=volunteer_relation.project.project_name, message=message))
         email_subject = 'Thank you for your work at {project_name}'.format(

common/components/controllers/CorporateHackathonController.jsx

@@ -441,7 +441,7 @@ class CorporateHackathonController extends React.PureComponent<{||}, State> {
     return (
       <a
         href={cdn.document(
-          "2022+DemocracyLab+Corporate+Hackathon+Prospectus.pdf"
+          "2023+DemocracyLab+Corporate+Hackathon+Prospectus.pdf"
         )}
       >
         Corporate Tech-for-Good Hackathons PDF{" "}
@@ -453,7 +453,7 @@ class CorporateHackathonController extends React.PureComponent<{||}, State> {
     return (
       <a 
         href={cdn.document(
-          "2022+DemocracyLab+Sponsorship+Prospectus.pdf"
+          "2023+DemocracyLab+Sponsorship+Prospectus.pdf"
         )}
       >
         Sponsor Prospectus PDF{" "}

democracylab/migrations/0010_alter_usertaggedtechnologies_tag.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2 on 2023-06-20 03:42
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("taggit", "0003_taggeditem_add_unique_index"),
+        ("democracylab", "0009_auto_20210302_2036"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="usertaggedtechnologies",
+            name="tag",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="%(app_label)s_%(class)s_items",
+                to="taggit.tag",
+            ),
+        ),
+    ]