From: Thibaut Girka Date: Mon, 28 Jan 2019 20:14:47 +0000 (+0100) Subject: Merge branch 'master' into glitch-soc/merge-upstream X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=42713b97106ffbeb9406d1a7086082a172fc2141;p=mastodon.git Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - README.md: kept our version --- 42713b97106ffbeb9406d1a7086082a172fc2141 diff --cc CONTRIBUTING.md index 8044d04f7,65366be5f..7eceaf142 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@@ -1,41 -1,7 +1,41 @@@ +# Contributing to Mastodon Glitch Edition # + +Thank you for your interest in contributing to the `glitch-soc` project! +Here are some guidelines, and ways you can help. + +> (This document is a bit of a work-in-progress, so please bear with us. +> If you don't see what you're looking for here, please don't hesitate to reach out!) + +## Planning ## + +Right now a lot of the planning for this project takes place in our development Discord, or through GitHub Issues and Projects. +We're working on ways to improve the planning structure and better solicit feedback, and if you feel like you can help in this respect, feel free to give us a holler. + +## Documentation ## + +The documentation for this repository is available at [`glitch-soc/docs`](https://github.com/glitch-soc/docs) (online at [glitch-soc.github.io/docs/](https://glitch-soc.github.io/docs/)). +Right now, we've mostly focused on the features that make this fork different from upstream in some manner. +Adding screenshots, improving descriptions, and so forth are all ways to help contribute to the project even if you don't know any code. + +## Frontend Development ## + +Check out [the documentation here](https://glitch-soc.github.io/docs/contributing/frontend/) for more information. + +## Backend Development ## + +See the guidelines below. + + - - - + +You should also try to follow the guidelines set out in the original `CONTRIBUTING.md` from `tootsuite/mastodon`, reproduced below. + +
+ +CONTRIBUTING +======= Contributing -============ - Thank you for considering contributing to Mastodon 🐘 + Thank you for considering contributing to Mastodon 🐘 You can contribute in the following ways: