From a9a57a3082e4de0a56efe0b5d4fb72fe262efc59 Mon Sep 17 00:00:00 2001 From: James Campos Date: Thu, 15 Mar 2012 18:00:22 -0700 Subject: [PATCH 1/4] fix #332: separate versioning; add contributing --- readme.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 0a9b4d33a..1ccc502bc 100644 --- a/readme.md +++ b/readme.md @@ -7,4 +7,16 @@ - Clone 4chan X. - `cd` into it and build with `cake build`. - For development (continuous builds), run `cake dev &`. Kill the process with `killall node`. -- Upgrade version with `cake -v VERSION upgrade`. + +# Releasing + +- Upgrade version with `cake -v VERSION upgrade`. Note that this is only used to +release new 4chan x versions, and is not needed or wanted in pull requests. + +# Contributing + +- Edit the changelog +- Edit the CoffeeScript source +- Build the JavaScript +- Fork the repo +- Send a pull request From 00a1fba7126ce51a27662f5c55fb72d67c154432 Mon Sep 17 00:00:00 2001 From: James Campos Date: Thu, 15 Mar 2012 18:49:24 -0700 Subject: [PATCH 2/4] follow my own instructions and edit changelog --- changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/changelog b/changelog index 06142db30..fa6ce1e92 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,8 @@ master - Mayhem Now works when using https. +- aeosynth + add `Releasing` and `Contributing` sections to readme 2.29.1 - Mayhem From 9fa1266e4b995d177dfb60479a0b5471f34c05bb Mon Sep 17 00:00:00 2001 From: James Campos Date: Fri, 16 Mar 2012 01:47:16 -0700 Subject: [PATCH 3/4] Revert "follow my own instructions and edit changelog" This reverts commit 00a1fba7126ce51a27662f5c55fb72d67c154432. desn't matter for the end user --- changelog | 2 -- 1 file changed, 2 deletions(-) diff --git a/changelog b/changelog index fa6ce1e92..06142db30 100644 --- a/changelog +++ b/changelog @@ -1,8 +1,6 @@ master - Mayhem Now works when using https. -- aeosynth - add `Releasing` and `Contributing` sections to readme 2.29.1 - Mayhem From 52b95e3b184a9ecc5c5d819a906ba9b4d8c46cef Mon Sep 17 00:00:00 2001 From: James Campos Date: Fri, 16 Mar 2012 01:49:09 -0700 Subject: [PATCH 4/4] only edit changelog if edits affect regular users --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 1ccc502bc..c6012445a 100644 --- a/readme.md +++ b/readme.md @@ -15,8 +15,8 @@ release new 4chan x versions, and is not needed or wanted in pull requests. # Contributing -- Edit the changelog - Edit the CoffeeScript source - Build the JavaScript +- If the edits affect regular users, edit the changelog - Fork the repo - Send a pull request