From 216a54fca4fd02d3fb75a2152f4c583261506b94 Mon Sep 17 00:00:00 2001 From: Ben Thomson Date: Tue, 30 Jul 2019 09:08:57 +0800 Subject: [PATCH 1/4] Add marketplace support issue template. Credit to @ayumihamsaki. --- .github/ISSUE_TEMPLATE/6_MARKETPLACE_SUPPORT.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/6_MARKETPLACE_SUPPORT.md diff --git a/.github/ISSUE_TEMPLATE/6_MARKETPLACE_SUPPORT.md b/.github/ISSUE_TEMPLATE/6_MARKETPLACE_SUPPORT.md new file mode 100644 index 000000000..ca9983f4a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/6_MARKETPLACE_SUPPORT.md @@ -0,0 +1,8 @@ +--- +name: "⚠️ Marketplace Support" +about: 'For reporting any marketplace issues, send an email to hello@octobercms.com' +--- + +All marketplace support issues will be promptly addressed through email support. + +Thanks! From 89165f55b5ee0e82e29732aadfcd4a9510477e73 Mon Sep 17 00:00:00 2001 From: Ben Thomson Date: Tue, 30 Jul 2019 09:18:18 +0800 Subject: [PATCH 2/4] Change icon for marketplace support template. --- .github/ISSUE_TEMPLATE/6_MARKETPLACE_SUPPORT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/6_MARKETPLACE_SUPPORT.md b/.github/ISSUE_TEMPLATE/6_MARKETPLACE_SUPPORT.md index ca9983f4a..d5f3e7b25 100644 --- a/.github/ISSUE_TEMPLATE/6_MARKETPLACE_SUPPORT.md +++ b/.github/ISSUE_TEMPLATE/6_MARKETPLACE_SUPPORT.md @@ -1,5 +1,5 @@ --- -name: "⚠️ Marketplace Support" +name: "🛒 Marketplace Support" about: 'For reporting any marketplace issues, send an email to hello@octobercms.com' --- From c18fc847668e1a7d70a9500c1b4beb67b74918b7 Mon Sep 17 00:00:00 2001 From: Luke Towers Date: Tue, 30 Jul 2019 09:32:53 -0600 Subject: [PATCH 3/4] Reordered support templates --- .github/ISSUE_TEMPLATE/2_MARKETPLACE_SUPPORT.md | 8 ++++++++ .../{2_SUPPORT_QUESTION.md => 4_GENERAL_SUPPORT.md} | 4 ++-- .../{4_DOCUMENTATION.md => 5_DOCUMENTATION.md} | 0 .github/ISSUE_TEMPLATE/6_MARKETPLACE_SUPPORT.md | 8 -------- .../{5_SECURITY_ISSUES.md => 6_SECURITY_ISSUES.md} | 0 5 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/2_MARKETPLACE_SUPPORT.md rename .github/ISSUE_TEMPLATE/{2_SUPPORT_QUESTION.md => 4_GENERAL_SUPPORT.md} (77%) rename .github/ISSUE_TEMPLATE/{4_DOCUMENTATION.md => 5_DOCUMENTATION.md} (100%) delete mode 100644 .github/ISSUE_TEMPLATE/6_MARKETPLACE_SUPPORT.md rename .github/ISSUE_TEMPLATE/{5_SECURITY_ISSUES.md => 6_SECURITY_ISSUES.md} (100%) diff --git a/.github/ISSUE_TEMPLATE/2_MARKETPLACE_SUPPORT.md b/.github/ISSUE_TEMPLATE/2_MARKETPLACE_SUPPORT.md new file mode 100644 index 000000000..a2e76acef --- /dev/null +++ b/.github/ISSUE_TEMPLATE/2_MARKETPLACE_SUPPORT.md @@ -0,0 +1,8 @@ +--- +name: "🛒 Marketplace Support" +about: 'For reporting any issues with the marketplace, send an email to hello@octobercms.com' +--- + +All marketplace support issues will be addressed through email support. + +Thanks! diff --git a/.github/ISSUE_TEMPLATE/2_SUPPORT_QUESTION.md b/.github/ISSUE_TEMPLATE/4_GENERAL_SUPPORT.md similarity index 77% rename from .github/ISSUE_TEMPLATE/2_SUPPORT_QUESTION.md rename to .github/ISSUE_TEMPLATE/4_GENERAL_SUPPORT.md index 3ea7271c1..c3e45978e 100644 --- a/.github/ISSUE_TEMPLATE/2_SUPPORT_QUESTION.md +++ b/.github/ISSUE_TEMPLATE/4_GENERAL_SUPPORT.md @@ -1,6 +1,6 @@ --- -name: "⚠️ Support Question" -about: 'This repository is only for reporting bugs or problems. If you need help, see: https://octobercms.com/support' +name: "⚠️ General Support" +about: 'This repository is only for reporting bugs or problems. If you need help using OctoberCMS, see: https://octobercms.com/support' --- This repository is only for reporting bugs or problems. If you need support, please use the following options: diff --git a/.github/ISSUE_TEMPLATE/4_DOCUMENTATION.md b/.github/ISSUE_TEMPLATE/5_DOCUMENTATION.md similarity index 100% rename from .github/ISSUE_TEMPLATE/4_DOCUMENTATION.md rename to .github/ISSUE_TEMPLATE/5_DOCUMENTATION.md diff --git a/.github/ISSUE_TEMPLATE/6_MARKETPLACE_SUPPORT.md b/.github/ISSUE_TEMPLATE/6_MARKETPLACE_SUPPORT.md deleted file mode 100644 index d5f3e7b25..000000000 --- a/.github/ISSUE_TEMPLATE/6_MARKETPLACE_SUPPORT.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: "🛒 Marketplace Support" -about: 'For reporting any marketplace issues, send an email to hello@octobercms.com' ---- - -All marketplace support issues will be promptly addressed through email support. - -Thanks! diff --git a/.github/ISSUE_TEMPLATE/5_SECURITY_ISSUES.md b/.github/ISSUE_TEMPLATE/6_SECURITY_ISSUES.md similarity index 100% rename from .github/ISSUE_TEMPLATE/5_SECURITY_ISSUES.md rename to .github/ISSUE_TEMPLATE/6_SECURITY_ISSUES.md From 37eb5b0c3c535f7c0473fd9d0c02e4f405a154a6 Mon Sep 17 00:00:00 2001 From: Luke Towers Date: Tue, 30 Jul 2019 09:35:29 -0600 Subject: [PATCH 4/4] Reordered issue templates --- .../{4_GENERAL_SUPPORT.md => 3_GENERAL_SUPPORT.md} | 2 +- .../{3_FEATURE_REQUEST.md => 4_FEATURE_REQUEST.md} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename .github/ISSUE_TEMPLATE/{4_GENERAL_SUPPORT.md => 3_GENERAL_SUPPORT.md} (79%) rename .github/ISSUE_TEMPLATE/{3_FEATURE_REQUEST.md => 4_FEATURE_REQUEST.md} (100%) diff --git a/.github/ISSUE_TEMPLATE/4_GENERAL_SUPPORT.md b/.github/ISSUE_TEMPLATE/3_GENERAL_SUPPORT.md similarity index 79% rename from .github/ISSUE_TEMPLATE/4_GENERAL_SUPPORT.md rename to .github/ISSUE_TEMPLATE/3_GENERAL_SUPPORT.md index c3e45978e..a76dd57b1 100644 --- a/.github/ISSUE_TEMPLATE/4_GENERAL_SUPPORT.md +++ b/.github/ISSUE_TEMPLATE/3_GENERAL_SUPPORT.md @@ -6,7 +6,7 @@ about: 'This repository is only for reporting bugs or problems. If you need help This repository is only for reporting bugs or problems. If you need support, please use the following options: - Forum: https://octobercms.com/forum -- Slack: https://octobercms.slack.com (Invite link: https://octobercms-slack.herokuapp.com/) +- Slack: https://octobercms.slack.com (Get an invite: https://octobercms-slack.herokuapp.com/) - Stack Overflow: https://stackoverflow.com/questions/tagged/octobercms Thanks! \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/3_FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/4_FEATURE_REQUEST.md similarity index 100% rename from .github/ISSUE_TEMPLATE/3_FEATURE_REQUEST.md rename to .github/ISSUE_TEMPLATE/4_FEATURE_REQUEST.md