From 168636882dedb44f7403a12fa8b4a3b47a2e487a Mon Sep 17 00:00:00 2001 From: Lemuel van der Merwe Date: Tue, 5 Mar 2024 14:52:39 +0200 Subject: [PATCH 1/4] Adds Sermon Distributor version, php version, and apache version choices to a-bug.yml --- .gitea/ISSUE_TEMPLATE/a-bug.yml | 45 ++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/.gitea/ISSUE_TEMPLATE/a-bug.yml b/.gitea/ISSUE_TEMPLATE/a-bug.yml index 83543832..c283e209 100644 --- a/.gitea/ISSUE_TEMPLATE/a-bug.yml +++ b/.gitea/ISSUE_TEMPLATE/a-bug.yml @@ -24,15 +24,58 @@ body: - type: dropdown id: system attributes: - label: Which Joomla version were you using? + label: Which Joomla version are you using? multiple: true options: + - Latest - Joomla 5 - Joomla 4 - Joomla 3 - Other validations: required: true + - type: dropdown + id: system + attributes: + label: Which Joomla Sermon Distributor version are you using? + multiple: true + options: + - Latest + - v5.0 + - v3.0 + - v2.1 + - v2.0 + - Other + validations: + required: true + - type: dropdown + id: system + attributes: + label: Which PHP version are you using? + multiple: true + options: + - Latest + - PHP 8.3 + - PHP 8.2 + - PHP 8.1 + - PHP 8.0 + - PHP 7.4 + - Other + validations: + required: true + - type: dropdown + id: system + attributes: + label: Which Apache version are you using? + multiple: true + options: + - Latest + - Apache 2.4 + - Apache 2.2 + - Apache 2.0 + - Other + validations: + required: true - type: dropdown id: area attributes: -- 2.45.1 From dd9b9aa30e79165d0110caaee5a78dda9417dfe0 Mon Sep 17 00:00:00 2001 From: Lemuel van der Merwe Date: Tue, 5 Mar 2024 15:02:22 +0200 Subject: [PATCH 2/4] Adds Sermon Distributor version choice to g-security.yml --- .gitea/ISSUE_TEMPLATE/g-security.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.gitea/ISSUE_TEMPLATE/g-security.yml b/.gitea/ISSUE_TEMPLATE/g-security.yml index d0c74bf2..67bc7591 100644 --- a/.gitea/ISSUE_TEMPLATE/g-security.yml +++ b/.gitea/ISSUE_TEMPLATE/g-security.yml @@ -26,6 +26,7 @@ body: label: Which Joomla version could potentially be affected? multiple: true options: + - Latest - Joomla 5 - Joomla 4 - Joomla 3 @@ -33,6 +34,21 @@ body: - Other validations: required: true + - type: dropdown + id: system + attributes: + label: Which Joomla Sermon Distributor version could potentially be affected? + multiple: true + options: + - Latest + - v5.0 + - v3.0 + - v2.1 + - v2.0 + - All + - Other + validations: + required: true - type: textarea id: non-sensitive-details attributes: @@ -45,4 +61,4 @@ body: id: comments attributes: label: Additional Comments - description: Feel free to include any further comments or pertinent details that might assist us. + description: Feel free to include any further comments or pertinent details that might assist us. \ No newline at end of file -- 2.45.1 From 9d2cbb0f7a4ecca584bc7d135a5048a6bcff997a Mon Sep 17 00:00:00 2001 From: Lemuel van der Merwe Date: Tue, 5 Mar 2024 16:00:27 +0200 Subject: [PATCH 3/4] Fixes the dropdown ids in a-bug.yml --- .gitea/ISSUE_TEMPLATE/a-bug.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/ISSUE_TEMPLATE/a-bug.yml b/.gitea/ISSUE_TEMPLATE/a-bug.yml index c283e209..49a2cacd 100644 --- a/.gitea/ISSUE_TEMPLATE/a-bug.yml +++ b/.gitea/ISSUE_TEMPLATE/a-bug.yml @@ -22,7 +22,7 @@ body: value: | # Environment Details - type: dropdown - id: system + id: joomla_version attributes: label: Which Joomla version are you using? multiple: true @@ -35,7 +35,7 @@ body: validations: required: true - type: dropdown - id: system + id: sermon_distributor_version attributes: label: Which Joomla Sermon Distributor version are you using? multiple: true @@ -49,7 +49,7 @@ body: validations: required: true - type: dropdown - id: system + id: php_version attributes: label: Which PHP version are you using? multiple: true @@ -64,7 +64,7 @@ body: validations: required: true - type: dropdown - id: system + id: apache_version attributes: label: Which Apache version are you using? multiple: true -- 2.45.1 From 721b25733cc34de31714c91685f9d111b51ab0c4 Mon Sep 17 00:00:00 2001 From: Lemuel van der Merwe Date: Tue, 5 Mar 2024 16:01:59 +0200 Subject: [PATCH 4/4] Fixes the dropdown ids in g-security.yml --- .gitea/ISSUE_TEMPLATE/g-security.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/ISSUE_TEMPLATE/g-security.yml b/.gitea/ISSUE_TEMPLATE/g-security.yml index 67bc7591..c08aeee1 100644 --- a/.gitea/ISSUE_TEMPLATE/g-security.yml +++ b/.gitea/ISSUE_TEMPLATE/g-security.yml @@ -21,7 +21,7 @@ body: value: | # Affected Systems - type: dropdown - id: system + id: joomla_version attributes: label: Which Joomla version could potentially be affected? multiple: true @@ -35,7 +35,7 @@ body: validations: required: true - type: dropdown - id: system + id: sermon_distributor_version attributes: label: Which Joomla Sermon Distributor version could potentially be affected? multiple: true -- 2.45.1