From 047ecdcb72b9c8cad9a4bf28958f1eb2fbc74d06 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Fri, 21 Feb 2020 12:16:42 +0100 Subject: [PATCH 1/2] Update communication channel for development work --- CONTRIBUTING.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a0b1666e14..0141567d4b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,7 +5,9 @@ Anyone is welcome to contribute to Bisq. This document provides an overview of h ## Communication Channels -Most communication about Bisq happens in the [Bisq Slack workspace](https://bisq.network/slack-invite). +Most communication about Bisq happens on [Keybase](https://keybase.io). + +Install Keybase and enter "bisq" from the teams tab. This is an "open" team, which means the admins will auto-accept any request to join, and you can get in fast. Discussion about code changes happens in GitHub issues and pull requests. From 12b5a4e619cd9b6bea92f2cbad3d920a33333517 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Fri, 21 Feb 2020 12:17:09 +0100 Subject: [PATCH 2/2] Reference critical bugs process --- CONTRIBUTING.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0141567d4b..cc42784398 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributing to Bisq -Anyone is welcome to contribute to Bisq. This document provides an overview of how we work. If you're looking for somewhere to start contributing, see the [good first issue](https://github.com/bisq-network/bisq/issues?q=is%3Aopen+is%3Aissue+label%3A"good+first+issue") list. +Anyone is welcome to contribute to Bisq. This document provides an overview of how we work. If you're looking for somewhere to start contributing, check out [critical bugs](https://bisq.wiki/Critical_Bugs) or see [good first issue](https://github.com/bisq-network/bisq/issues?q=is%3Aopen+is%3Aissue+label%3A"good+first+issue") list. ## Communication Channels @@ -45,7 +45,12 @@ Please note that Pull Requests marked `NACK` and/or GitHub's `Change requested` ## Compensation -Bisq is not a company, but operates as a _decentralized autonomous organization_ (DAO). For any work merged into Bisq's `master` branch, you can [submit a compensation request](https://docs.bisq.network/dao/phase-zero.html#how-to-request-compensation) and earn BSQ (the Bisq DAO native token). Learn more about the Bisq DAO and BSQ [here](https://docs.bisq.network/dao/phase-zero.html). +Bisq is not a company, but operates as a _decentralized autonomous organization_ (DAO). + +Since our [Q1 2020 update](https://bisq.network/blog/q1-2020-update/) contributions are NOT eligible for compensation unless they are allocated as part of the development budget. Fixes for [critical bugs](https://bisq.wiki/Critical_Bugs) are eligible for compensation when delivered. +In any case please contact the team lead for development (@ripcurlx) upfront if you want to get compensated for your contributions. + +For any work that was approved and merged into Bisq's `master` branch, you can [submit a compensation request](https://docs.bisq.network/dao/phase-zero.html#how-to-request-compensation) and earn BSQ (the Bisq DAO native token). Learn more about the Bisq DAO and BSQ [here](https://docs.bisq.network/dao/phase-zero.html). ## Style and Coding Conventions