From 8d790ffb98acf4940fc2276f0bd0f185e69e96ae Mon Sep 17 00:00:00 2001 From: Andrey D Date: Fri, 24 Nov 2017 20:10:21 +0200 Subject: [PATCH] Update contributing.ms to use signal.org URLs; remove Bithub references (#2806) * Update contributing.md to use signal.org URLs * Remove Bithub references from readme.md, contributing.md In hand with: https://github.com/WhisperSystems/Signal-Android/commit/0bcf46bacda6ac94cdb44dccc1ae8d710175d599 * Remove Bithub references from PR template --- .github/PULL_REQUEST_TEMPLATE.md | 1 - CONTRIBUTING.md | 10 +--------- README.md | 4 ---- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 118de5c7e..5019d80d5 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -13,7 +13,6 @@ - [ ] I have tested my contribution on these devices: * iDevice A, iOS X.Y.Z * iDevice B, iOS Z.Y -- [ ] I have made the choice whether I want the [BitHub reward](https://github.com/WhisperSystems/Signal-Android/wiki/BitHub-Rewards) or not by omitting or adding the word `FREEBIE` in my commit message - - - - - - - - - - diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 774c18983..8bb3381aa 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,7 +3,7 @@ Apple requires contributors to iOS projects to relicense their code on submit. We'll have to have individual contributors sign something to enable this. Our volunteer legal have put together a form you can sign electronically. So no scanning, faxing, or carrier pigeons involved. How modern: -https://whispersystems.org/cla/ +https://signal.org/cla/ Please go ahead and sign, putting your github username in "Address line #2", so that we can accept your pull requests at our heart's delight. @@ -30,14 +30,6 @@ It's the eternal debate. We chose to adopt spaces. Please set your default Xcode If you don't agree with us, you can use the [ClangFormat Xcode plugin](https://github.com/travisjeffery/ClangFormat-Xcode) to code with your favorite indentation style! -## BitHub - -Open Whisper Systems is currently [experimenting](https://whispersystems.org/blog/bithub/) with the funding privacy Free and Open Source software. For example, this is the current Open WhisperSystems payout per commit, rendered dynamically as an image by the Open WhisperSystems BitHub instance: - -[![Bithub Payment Amount](https://bithub.herokuapp.com/v1/status/payment/commit)](https://whispersystems.org/blog/bithub/) - -If you'd like to opt out of receiving a payment, simply include the string "FREEBIE" somewhere in your commit message, and you will not receive BTC for that commit. - ## Contributors Signal wouldn’t be possible without the many open-source projects we depend on. Big shoutout to the maintainers of all the [pods](https://github.com/WhisperSystems/Signal-iOS/blob/master/Podfile) we use! diff --git a/README.md b/README.md index ab508e24e..203732109 100644 --- a/README.md +++ b/README.md @@ -15,10 +15,6 @@ We recommend going through our issues and picking out something with the [help w For larger changes and feature ideas, we ask that you propose it on the [unofficial Community Forum](https://whispersystems.discoursehosting.net) for a high-level discussion with the wider community before implementation. -This repository is set up with [BitHub](https://whispersystems.org/blog/bithub/), so you can make money for committing to Signal-iOS. The current BitHub price for an accepted pull request is: - -[![Current BitHub Price](https://bithub.herokuapp.com/v1/status/payment/commit/)](https://whispersystems.org/blog/bithub/) - ## Contributing Ideas Have something you want to say about Open Whisper Systems projects or want to be part of the conversation? Get involved in the [community forum](https://whispersystems.discoursehosting.net).