From a6a4fbdfcb492fdfee6dff7cb38bb729aec3c4b8 Mon Sep 17 00:00:00 2001
From: m52go <mfiver@gmail.com>
Date: Tue, 16 Jun 2020 00:23:34 -0400
Subject: [PATCH 1/5] Modify issue template to accommodate new format

To streamline budgeting. As detailed here:
https://github.com/bisq-network/projects/issues/32
---
 ISSUE_TEMPLATE.md | 58 +++++++++++++++++++++++++++++++++++++----------
 1 file changed, 46 insertions(+), 12 deletions(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 431f3b3..e982cd9 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,25 +1,59 @@
+<!--
+Compensation requests have a specific format that enables them to be parsed programmatically for more efficient budgeting. Please make sure you stick to the template. A linter will evaluate your request after you remove [WIP] from the issue title and notify you of any issues.
+
+See the following link for details:
+https://bisq.wiki/Making_a_compensation_request
+
+Feel free to browse other requests if you're not sure about something, or reach out in #compensation on Keybase (https://keybase.io/team/bisq).
+-->
+
+
 ## Summary
 
-> _Specify the total amount of BSQ you are requesting:_
+> _Specify the total amount of BSQ you are requesting, along with the USD total and BSQ/USD rate:_
 
- - BSQ requested:
- 
- <!--
- Don't forget to make your compensation request in the actual Bisq DAO! See the following link for details:
- https://docs.bisq.network/compensation.html
- -->
+- **BSQ requested**: **`[BSQ amount]`** <!-- [BSQ amount] should be: USD amount / BSQ rate -->
+- USD requested: [USD amount] <!-- [USD amount] should be: total of all contributions listed in "contributions delivered" table below -->
+- BSQ rate: [rate] USD per BSQ <!-- [rate] should be the rate used to determine the BSQ amount above, as specified in the cycle's rate announcement (https://bisq.wiki/Compensation_Maintainer#Announce_BSQ-USD_rate) -->
 
 
 ## Contributions delivered
 
-> _Provide links to contributions you have [delivered](https://github.com/bisq-network/proposals/issues/19), the amount of BSQ you are requesting for each, and any comments that will help stakeholders understand its value._
+> _Add contributions you have [delivered](https://github.com/bisq-network/proposals/issues/19) here as new rows in the table below. See comments below the table for guidance._
 
+| Title | Team | USD | Link | Notes |
+| --- | --- | --- | --- | --- |
 
-## Contributions in progress
+<!-- 
+
+Each contribution should be a new line-item in the table above. 
+
+Title - optional, string.
+Team - optional, must one of the following: admin, dev, growth, ops, support (case-insensitive). If the line-item is for a role, please add a `*`. See Example 2 below.
+USD - optional, number. Please do not specify 'USD', as the column title makes units clear.
+Link - optional, string.
+Notes - optional, string.
 
-> _Provide links to work you're involved with that is still [in progress](https://github.com/bisq-network/proposals/issues/19). **This section is optional,** and is for your own benefit in keeping track of what you're doing and keeping other contributors up to date with the same._
+Example 1 - typical contribution:
 
+| Add local Bitcoin node configuration detection | dev | 240 | https://github.com/bisq-network/bisq/pull/3982
 
-## Roles performed
+Example 2 - role (note the asterisk):
+
+| Community manager | growth* | 400 | https://github.com/bisq-network/roles/issues/95#issuecomment-628431613
+
+Example 3 - list of minor contributions, such as reviews:
+
+| | | | https://github.com/bisq-network/bisq/pull/3968 | This and PRs below too small to be valued separately. See total at bottom.
+| | | | https://github.com/bisq-network/bisq/pull/4040
+| | | | https://github.com/bisq-network/bisq/pull/4044
+| | | | https://github.com/bisq-network/bisq/pull/4048
+| | | | https://github.com/bisq-network/bisq/pull/4066
+| | dev | 400 | https://github.com/bisq-network/bisq/pull/4062 | Total for items above.
+
+-->
+
+
+## Contributions in progress
 
-> _Provide links to your [monthly report](https://github.com/bisq-network/proposals/issues/13) on any roles you are responsible for._
+> _Provide links to work you're involved with that is still [in progress](https://github.com/bisq-network/proposals/issues/19). **This section is optional (the parser ignores it),** and is for your own benefit in keeping track of what you're doing and keeping other contributors up to date with the same._

From 005d1833f8bf0f816d22bbdbef9adc1768b429d4 Mon Sep 17 00:00:00 2001
From: m52go <mfiver@gmail.com>
Date: Tue, 16 Jun 2020 11:21:06 -0400
Subject: [PATCH 2/5] Remove misleading note about "see comments below"

Also mention that contributions table includes roles performed.
---
 ISSUE_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index e982cd9..dc69c23 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -19,7 +19,7 @@ Feel free to browse other requests if you're not sure about something, or reach
 
 ## Contributions delivered
 
-> _Add contributions you have [delivered](https://github.com/bisq-network/proposals/issues/19) here as new rows in the table below. See comments below the table for guidance._
+> _Add contributions you have [delivered](https://github.com/bisq-network/proposals/issues/19) and roles you have performed here as new rows in the table below._
 
 | Title | Team | USD | Link | Notes |
 | --- | --- | --- | --- | --- |

From 508e0ccbde92667671ce3a33c60d4f6a12aaf4d2 Mon Sep 17 00:00:00 2001
From: m52go <mfiver@gmail.com>
Date: Tue, 16 Jun 2020 11:25:04 -0400
Subject: [PATCH 3/5] Change mentions of "parser" to "linter"

For consistency.
---
 ISSUE_TEMPLATE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index dc69c23..03595b8 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,5 +1,5 @@
 <!--
-Compensation requests have a specific format that enables them to be parsed programmatically for more efficient budgeting. Please make sure you stick to the template. A linter will evaluate your request after you remove [WIP] from the issue title and notify you of any issues.
+Compensation requests have a specific format that enables them to be evaluated by a bot for more efficient budgeting. Please make sure you stick to the template. A linter will evaluate your request after you remove [WIP] from the issue title and notify you of any issues.
 
 See the following link for details:
 https://bisq.wiki/Making_a_compensation_request
@@ -56,4 +56,4 @@ Example 3 - list of minor contributions, such as reviews:
 
 ## Contributions in progress
 
-> _Provide links to work you're involved with that is still [in progress](https://github.com/bisq-network/proposals/issues/19). **This section is optional (the parser ignores it),** and is for your own benefit in keeping track of what you're doing and keeping other contributors up to date with the same._
+> _Provide links to work you're involved with that is still [in progress](https://github.com/bisq-network/proposals/issues/19). **This section is optional (the linter ignores it),** and is for your own benefit in keeping track of what you're doing and keeping other contributors up to date with the same._

From f762323af7f1ed82dc290d785b10a088f3ba07b7 Mon Sep 17 00:00:00 2001
From: m52go <mfiver@gmail.com>
Date: Wed, 17 Jun 2020 09:13:44 -0400
Subject: [PATCH 4/5] Add field for last compensation request

---
 ISSUE_TEMPLATE.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 03595b8..208cbf5 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -15,6 +15,7 @@ Feel free to browse other requests if you're not sure about something, or reach
 - **BSQ requested**: **`[BSQ amount]`** <!-- [BSQ amount] should be: USD amount / BSQ rate -->
 - USD requested: [USD amount] <!-- [USD amount] should be: total of all contributions listed in "contributions delivered" table below -->
 - BSQ rate: [rate] USD per BSQ <!-- [rate] should be the rate used to determine the BSQ amount above, as specified in the cycle's rate announcement (https://bisq.wiki/Compensation_Maintainer#Announce_BSQ-USD_rate) -->
+- Previous compensation request (if applicable): #  <!-- Link to last compensation request submitted -->
 
 
 ## Contributions delivered

From 1b94f34488a592662cba987a92d39b77c7c6a58a Mon Sep 17 00:00:00 2001
From: m52go <mfiver@gmail.com>
Date: Wed, 17 Jun 2020 09:16:09 -0400
Subject: [PATCH 5/5] Add note about asterisk in team column for roles

---
 ISSUE_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 208cbf5..7bf69bd 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -20,7 +20,7 @@ Feel free to browse other requests if you're not sure about something, or reach
 
 ## Contributions delivered
 
-> _Add contributions you have [delivered](https://github.com/bisq-network/proposals/issues/19) and roles you have performed here as new rows in the table below._
+> _Add contributions you have [delivered](https://github.com/bisq-network/proposals/issues/19) and roles you have performed here as new rows in the table below. Role line-items should include an asterisk (*) in the team column._
 
 | Title | Team | USD | Link | Notes |
 | --- | --- | --- | --- | --- |