From 3051018aff10179c2188696d23a17bea997e1e71 Mon Sep 17 00:00:00 2001 From: Ben Thomson Date: Mon, 3 Aug 2020 23:11:30 +0800 Subject: [PATCH 1/4] Update content of script fixture files --- tests/fixtures/themes/test/assets/js/script1.js | 1 + tests/fixtures/themes/test/assets/js/script2.js | 1 + tests/fixtures/themes/test/assets/js/subdir/script1.js | 1 + 3 files changed, 3 insertions(+) create mode 100644 tests/fixtures/themes/test/assets/js/subdir/script1.js diff --git a/tests/fixtures/themes/test/assets/js/script1.js b/tests/fixtures/themes/test/assets/js/script1.js index e69de29bb..b8bbe4e13 100644 --- a/tests/fixtures/themes/test/assets/js/script1.js +++ b/tests/fixtures/themes/test/assets/js/script1.js @@ -0,0 +1 @@ +console.log('script1.js'); diff --git a/tests/fixtures/themes/test/assets/js/script2.js b/tests/fixtures/themes/test/assets/js/script2.js index e69de29bb..54e00dea3 100644 --- a/tests/fixtures/themes/test/assets/js/script2.js +++ b/tests/fixtures/themes/test/assets/js/script2.js @@ -0,0 +1 @@ +console.log('script2.js'); diff --git a/tests/fixtures/themes/test/assets/js/subdir/script1.js b/tests/fixtures/themes/test/assets/js/subdir/script1.js new file mode 100644 index 000000000..bc27e099c --- /dev/null +++ b/tests/fixtures/themes/test/assets/js/subdir/script1.js @@ -0,0 +1 @@ +console.log('subdir/script1.js'); From 40f9d7e40c3508c888ba149a9607f7841eaf82de Mon Sep 17 00:00:00 2001 From: Ben Thomson Date: Mon, 3 Aug 2020 23:17:10 +0800 Subject: [PATCH 2/4] Revert "Update content of script fixture files" This reverts commit 3051018aff10179c2188696d23a17bea997e1e71. --- tests/fixtures/themes/test/assets/js/script1.js | 1 - tests/fixtures/themes/test/assets/js/script2.js | 1 - tests/fixtures/themes/test/assets/js/subdir/script1.js | 1 - 3 files changed, 3 deletions(-) delete mode 100644 tests/fixtures/themes/test/assets/js/subdir/script1.js diff --git a/tests/fixtures/themes/test/assets/js/script1.js b/tests/fixtures/themes/test/assets/js/script1.js index b8bbe4e13..e69de29bb 100644 --- a/tests/fixtures/themes/test/assets/js/script1.js +++ b/tests/fixtures/themes/test/assets/js/script1.js @@ -1 +0,0 @@ -console.log('script1.js'); diff --git a/tests/fixtures/themes/test/assets/js/script2.js b/tests/fixtures/themes/test/assets/js/script2.js index 54e00dea3..e69de29bb 100644 --- a/tests/fixtures/themes/test/assets/js/script2.js +++ b/tests/fixtures/themes/test/assets/js/script2.js @@ -1 +0,0 @@ -console.log('script2.js'); diff --git a/tests/fixtures/themes/test/assets/js/subdir/script1.js b/tests/fixtures/themes/test/assets/js/subdir/script1.js deleted file mode 100644 index bc27e099c..000000000 --- a/tests/fixtures/themes/test/assets/js/subdir/script1.js +++ /dev/null @@ -1 +0,0 @@ -console.log('subdir/script1.js'); From 69fef086cb61631fb4e76a7a42b6e2e3105fcd3a Mon Sep 17 00:00:00 2001 From: Ben Thomson Date: Fri, 7 Aug 2020 15:52:55 +0800 Subject: [PATCH 3/4] Add Discord to our contributor guidelines, minor tweaks --- .github/CONTRIBUTING.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 021d7417a..f2b25d4c5 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -11,7 +11,7 @@ Thank you for your interest in contributing to the OctoberCMS project. We apprec ## Reporting a Security Vulnerability -Please review [our security policy](https://github.com/octobercms/october/security/policy) on how to report security vulnerabilities. +Please review [our security policy](https://github.com/octobercms/october/security/policy) on how to report security vulnerabilities. Please do not report security vulnerabilities on GitHub. ## Reporting an issue with OctoberCMS @@ -21,6 +21,8 @@ We work hard to process bugs that are reported, to assist with this please ensur - **Summary**: Make sure your summary reflects what the problem is and where it is. Provide as much detail as possible, the more information we have to work with the more likely it is that your problem can be solved. +- **Installed build and plugins**: Please provide the build number of October CMS that is exhibiting the fault, and the version numbers of any installed and active plugins on your installation. You may retrieve this information by logging in to the Backend and navigating to *Settings* and then *Updates & Plugins*. + - **Reproduce steps**: Clearly mention the steps to reproduce the bug. - **Expected behavior**: Describe how OctoberCMS should behave on above mentioned steps. @@ -61,7 +63,7 @@ We do our best to attend to all reported issues. If you have an important issue >**NOTE:** Please don't use GitHub issues for suggesting a new feature. If you have a feature idea, the best place to suggest it is the [OctoberCMS website forum](https://octobercms.com/forum/chan/feature-requests). -Only use GitHub if you are planning on contributing a new feature and developing it. If you want to discuss your idea first, before "officially" posting it anywhere, you can always join us on [IRC](https://octobercms.com/chat) or [Slack](https://octobercms.slack.com). +Only use GitHub if you are planning on contributing a new feature and developing it. If you want to discuss your idea first, before "officially" posting it anywhere, you can always join us on [Discord](https://discord.gg/gEKgwSZ) or [IRC](https://octobercms.com/chat). #### GitHub feature requests From 46b0389678a4291d44add36f2768ecafcad98267 Mon Sep 17 00:00:00 2001 From: Ben Thomson Date: Fri, 7 Aug 2020 15:56:42 +0800 Subject: [PATCH 4/4] Remove IRC link. --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index f2b25d4c5..164bc3665 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -63,7 +63,7 @@ We do our best to attend to all reported issues. If you have an important issue >**NOTE:** Please don't use GitHub issues for suggesting a new feature. If you have a feature idea, the best place to suggest it is the [OctoberCMS website forum](https://octobercms.com/forum/chan/feature-requests). -Only use GitHub if you are planning on contributing a new feature and developing it. If you want to discuss your idea first, before "officially" posting it anywhere, you can always join us on [Discord](https://discord.gg/gEKgwSZ) or [IRC](https://octobercms.com/chat). +Only use GitHub if you are planning on contributing a new feature and developing it. If you want to discuss your idea first, before "officially" posting it anywhere, you can always join us on [Discord](https://discord.gg/gEKgwSZ). #### GitHub feature requests