diff --git a/package-lock.json b/package-lock.json index abd9f5397..36bbc73f3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ "@tensorflow/tfjs-core": "3.21.0", "bowser": "2.11.0", "classnames": "2.5.1", - "core-js": "3.35.1", + "core-js": "3.36.0", "font-awesome": "4.7.0", "form-urlencoded": "6.1.4", "formdata-polyfill": "4.0.10", @@ -48,8 +48,8 @@ "react-dom": "17.0.2", "react-helmet": "6.1.0", "react-redux": "7.2.9", - "react-router": "6.22.0", - "react-router-dom": "6.22.0", + "react-router": "6.22.1", + "react-router-dom": "6.22.1", "react-router-hash-link": "2.4.3", "react-scrollspy": "3.4.3", "react-transition-group": "4.4.5", @@ -4371,9 +4371,9 @@ "integrity": "sha512-1dgmkh+3so0+LlBWRhGA33ua4MYr7tUOj+a9Si28vUi0IUFNbff1T3sgpeDJI/LaC75bBYnQ0A3wXjn0OrRNBA==" }, "node_modules/@remix-run/router": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.15.0.tgz", - "integrity": "sha512-HOil5aFtme37dVQTB6M34G95kPM3MMuqSmIRVCC52eKV+Y/tGSqw9P3rWhlAx6A+mz+MoX+XxsGsNJbaI5qCgQ==", + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.15.1.tgz", + "integrity": "sha512-zcU0gM3z+3iqj8UX45AmWY810l3oUmXM7uH4dt5xtzvMhRtYVhKGOmgOd1877dOPPepfCjUv57w+syamWIYe7w==", "engines": { "node": ">=14.0.0" } @@ -7199,9 +7199,9 @@ } }, "node_modules/core-js": { - "version": "3.35.1", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.35.1.tgz", - "integrity": "sha512-IgdsbxNyMskrTFxa9lWHyMwAJU5gXOPP+1yO+K59d50VLVAIDAbs7gIv705KzALModfK3ZrSZTPNpC0PQgIZuw==", + "version": "3.36.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.36.0.tgz", + "integrity": "sha512-mt7+TUBbTFg5+GngsAxeKBTl5/VS0guFeJacYge9OmHb+m058UwwIm41SE9T4Den7ClatV57B6TYTuJ0CX1MAw==", "hasInstallScript": true, "funding": { "type": "opencollective", @@ -15844,11 +15844,11 @@ } }, "node_modules/react-router": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.22.0.tgz", - "integrity": "sha512-q2yemJeg6gw/YixRlRnVx6IRJWZD6fonnfZhN1JIOhV2iJCPeRNSH3V1ISwHf+JWcESzLC3BOLD1T07tmO5dmg==", + "version": "6.22.1", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.22.1.tgz", + "integrity": "sha512-0pdoRGwLtemnJqn1K0XHUbnKiX0S4X8CgvVVmHGOWmofESj31msHo/1YiqcJWK7Wxfq2a4uvvtS01KAQyWK/CQ==", "dependencies": { - "@remix-run/router": "1.15.0" + "@remix-run/router": "1.15.1" }, "engines": { "node": ">=14.0.0" @@ -15858,12 +15858,12 @@ } }, "node_modules/react-router-dom": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.22.0.tgz", - "integrity": "sha512-z2w+M4tH5wlcLmH3BMMOMdrtrJ9T3oJJNsAlBJbwk+8Syxd5WFJ7J5dxMEW0/GEXD1BBis4uXRrNIz3mORr0ag==", + "version": "6.22.1", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.22.1.tgz", + "integrity": "sha512-iwMyyyrbL7zkKY7MRjOVRy+TMnS/OPusaFVxM2P11x9dzSzGmLsebkCvYirGq0DWB9K9hOspHYYtDz33gE5Duw==", "dependencies": { - "@remix-run/router": "1.15.0", - "react-router": "6.22.0" + "@remix-run/router": "1.15.1", + "react-router": "6.22.1" }, "engines": { "node": ">=14.0.0" diff --git a/package.json b/package.json index fd2f34157..45c8cd616 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "@tensorflow/tfjs-core": "3.21.0", "bowser": "2.11.0", "classnames": "2.5.1", - "core-js": "3.35.1", + "core-js": "3.36.0", "font-awesome": "4.7.0", "form-urlencoded": "6.1.4", "formdata-polyfill": "4.0.10", @@ -66,8 +66,8 @@ "react-dom": "17.0.2", "react-helmet": "6.1.0", "react-redux": "7.2.9", - "react-router": "6.22.0", - "react-router-dom": "6.22.0", + "react-router": "6.22.1", + "react-router-dom": "6.22.1", "react-router-hash-link": "2.4.3", "react-scrollspy": "3.4.3", "react-transition-group": "4.4.5", diff --git a/src/notification-preferences/messages.js b/src/notification-preferences/messages.js index b48349291..c146c4b97 100644 --- a/src/notification-preferences/messages.js +++ b/src/notification-preferences/messages.js @@ -12,6 +12,7 @@ const messages = defineMessages({ key, select, discussion {Discussions} coursework {Course Work} + updates {Updates} other {{key}} }`, description: 'Display text for Notification Types', @@ -23,7 +24,11 @@ const messages = defineMessages({ core {Core notifications} newDiscussionPost {New discussion posts} newQuestionPost {New question posts} +<<<<<<< HEAD contentReported {Reported content} +======= + courseUpdate {Course updates} +>>>>>>> c19145e (fix: add correct strings for new course update notifications) other {{text}} }`, description: 'Display text for Notification Types',