Merge branch '4.0' into 4

This commit is contained in:
Steve Boyd 2023-05-04 13:27:49 +12:00
commit b58e003432
4 changed files with 13 additions and 21 deletions

View File

@ -9,20 +9,12 @@ This module provides commenting functionality for Pages and other DataObjects on
For more documentation about the module see the provided documentation located inside the docs folder. For more documentation about the module see the provided documentation located inside the docs folder.
## Requirements
* Silverstripe ^4.0
**Note:** This branch is compatible with Silverstripe 4. For a Silverstripe 3 release, please see the 2.x release line.
## Installation ## Installation
``` ```sh
composer require silverstripe/comments composer require silverstripe/comments
``` ```
See docs/en/Installing.md
## Related ## Related
* [silverstripe/comment-notifications](https://github.com/silverstripe/comment-notifications): Comment admin email notifications module * [silverstripe/comment-notifications](https://github.com/silverstripe/comment-notifications): Comment admin email notifications module
@ -39,4 +31,4 @@ and any new translations will be merged back to the project source code.
Please use https://www.transifex.com/projects/p/silverstripe-comments/ to contribute translations, Please use https://www.transifex.com/projects/p/silverstripe-comments/ to contribute translations,
rather than sending pull requests with YAML files. rather than sending pull requests with YAML files.
See the ["i18n" topic](https://docs.silverstripe.org/en/4/developer_guides/i18n/) on doc.silverstripe.org for more details. See the ["i18n" topic](https://docs.silverstripe.org/en/developer_guides/i18n/) on docs.silverstripe.org for more details.

View File

@ -33,8 +33,8 @@
"jquery-validation": "^1.19.5" "jquery-validation": "^1.19.5"
}, },
"devDependencies": { "devDependencies": {
"@silverstripe/eslint-config": "^1.0.0-alpha6", "@silverstripe/eslint-config": "^1.0.0",
"@silverstripe/webpack-config": "^2.0.0-alpha5", "@silverstripe/webpack-config": "^2.0.0",
"copy-webpack-plugin": "^11.0.0", "copy-webpack-plugin": "^11.0.0",
"webpack": "^5.74.0", "webpack": "^5.74.0",
"webpack-cli": "^5.0.0" "webpack-cli": "^5.0.0"

View File

@ -1261,10 +1261,10 @@
resolved "https://registry.yarnpkg.com/@sect/modernizr-loader/-/modernizr-loader-1.0.3.tgz#7fd8cec372426c53f113f3cfd9344cb29e959825" resolved "https://registry.yarnpkg.com/@sect/modernizr-loader/-/modernizr-loader-1.0.3.tgz#7fd8cec372426c53f113f3cfd9344cb29e959825"
integrity sha512-47zKwv4/1I0CYptZz8s4aSYSe0awmuyqa+HFKxN89/75h2q8hr6V752TZ9VjhGDhQ4gU0EU7Plew7b+7bf2crg== integrity sha512-47zKwv4/1I0CYptZz8s4aSYSe0awmuyqa+HFKxN89/75h2q8hr6V752TZ9VjhGDhQ4gU0EU7Plew7b+7bf2crg==
"@silverstripe/eslint-config@^1.0.0-alpha6": "@silverstripe/eslint-config@^1.0.0":
version "1.0.0-alpha6" version "1.0.0"
resolved "https://registry.yarnpkg.com/@silverstripe/eslint-config/-/eslint-config-1.0.0-alpha6.tgz#1f243b003fddf3503a4abea37f35a8a5968cc96e" resolved "https://registry.yarnpkg.com/@silverstripe/eslint-config/-/eslint-config-1.0.0.tgz#dcf3f9cf2158bb587d8048a7c2860c0513221d40"
integrity sha512-+P7UzhMRSmc7UlRYCiSXwjauLFYU11oBPwHl/bpacJ7xUcFY3Jt3CgcDt6d+XLvAJO8zMRsG9RcOm5MnxsyCsg== integrity sha512-pcHzB+6KWd8BPStBhHM8achdNY/Yj1p3WSTEs/CSw61VRcfBfg5GZECtvEerTSX/0ZeawAM1ABvstIAYihcfAg==
dependencies: dependencies:
eslint "^8.26.0" eslint "^8.26.0"
eslint-config-airbnb "^19.0.4" eslint-config-airbnb "^19.0.4"
@ -1274,10 +1274,10 @@
eslint-plugin-react "^7.31.10" eslint-plugin-react "^7.31.10"
eslint-webpack-plugin "^3.2.0" eslint-webpack-plugin "^3.2.0"
"@silverstripe/webpack-config@^2.0.0-alpha5": "@silverstripe/webpack-config@^2.0.0":
version "2.0.0-alpha6" version "2.0.0"
resolved "https://registry.yarnpkg.com/@silverstripe/webpack-config/-/webpack-config-2.0.0-alpha6.tgz#4a781f600344c3604169de08244ca11cacbd46f7" resolved "https://registry.yarnpkg.com/@silverstripe/webpack-config/-/webpack-config-2.0.0.tgz#278a72a1adbc6fa2362497d60424c78fba58e8e1"
integrity sha512-cPux01Z6EGwnSg5EezaJZ1S2x4ThfA3TbpTWTsqmW2jvr1VM/7Xu8B3j2HFH+2fNP0dvdmu+fScCD6VPNVQNWw== integrity sha512-m1qGRxlsdhWL567cWe7IZNBUCzeyg3T1Y9yY9Y6XClwAqlg1oIO9uLfvfauA4dbtECrzU5n1AkaaU6kMRtN6Aw==
dependencies: dependencies:
"@babel/core" "^7.19.6" "@babel/core" "^7.19.6"
"@babel/preset-env" "^7.19.4" "@babel/preset-env" "^7.19.4"