Merge remote-tracking branch 'upstream/master' into salman/remove-bok-choy

openedx/core/djangoapps/content_tagging/rest_api/v1/urls.py

@@ -7,6 +7,7 @@ from rest_framework.routers import DefaultRouter
 from django.urls.conf import path, include
 
 from openedx_tagging.core.tagging.rest_api.v1 import (
+    views as oel_tagging_views,
     views_import as oel_tagging_views_import,
 )
 
@@ -17,6 +18,11 @@ router.register("taxonomies", views.TaxonomyOrgView, basename="taxonomy")
 router.register("object_tags", views.ObjectTagOrgView, basename="object_tag")
 
 urlpatterns = [
+    path(
+        "taxonomies/<str:pk>/tags/",
+        oel_tagging_views.TaxonomyTagsView.as_view(),
+        name="taxonomy-tags",
+    ),
     path(
         "taxonomies/import/template.<str:file_ext>",
         oel_tagging_views_import.TemplateView.as_view(),

openedx/core/djangoapps/notifications/base_notification.py

@@ -95,7 +95,7 @@ COURSE_NOTIFICATION_TYPES = {
             'replier_name': 'replier name',
         },
         'email_template': '',
-        'filter': [FILTER_AUDIT_EXPIRED]
+        'filters': [FILTER_AUDIT_EXPIRED]
     },
     'comment_on_followed_post': {
         'notification_app': 'discussion',
@@ -111,7 +111,7 @@ COURSE_NOTIFICATION_TYPES = {
             'replier_name': 'replier name',
         },
         'email_template': '',
-        'filter': [FILTER_AUDIT_EXPIRED]
+        'filters': [FILTER_AUDIT_EXPIRED]
     },
 }