about summary refs log tree commit diff
path: root/CONTRIBUTING.md
AgeCommit message (Collapse)Author
2021-07-13Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `CONTRIBUTING.md`: Upstream file has changed and we're quoting it. Ported the changes. - `README.md`: Upstream file has changed but we have a completely different one. Kept our version. - `lib/mastodon/version.rb`: Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`, but we're still `glitch-soc/mastodon`. Kept our version. - `spec/presenters/instance_presenter_spec.rb`: Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`, but we're still `glitch-soc/mastodon`. Kept our version.
2021-07-13Change references to tootsuite/mastodon to mastodon/mastodon (#16491)Claire
* Change references to tootsuite/mastodon to mastodon/mastodon * Remove obsolete test fixture * Replace occurrences of tootsuite/mastodon with mastodon/mastodon in CHANGELOG And a few other places
2021-05-17Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: our READMEs are entirely different and upstream's has been updated. Kept our README.
2021-05-16Add pull request title recommendations to CONTRIBUTING.md (#16247)Eugen Rochko
2021-01-26Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `CONTRIBUTING.md`: Not a real conflict, glitch-soc quotes the upstream file, which has been changed. Update the quote.
2021-01-24Fix link to documentation repo (#15620)Joe
2019-11-20Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code
2019-11-17Edit CONTRIBUTING.md (#12401)sclaire-1
Edited to improve clarity, concision, and assertiveness
2019-11-06Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `package.json`
2019-11-04Fix crowdin badge display in CONTRIBUTING.md (#12273)Scott Sweeny
* Fix crowdin badge display in CONTRIBUTING.md The Crowdin localization badge in `CONTRIBUTING.md` appeared to have the wrong markup around it. This manifested in some extra brackets and an unformatted `crowdin` string. * Make Crowdin badge a link to the Mastodon project
2019-06-16Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-06-16Update translating platform has changed to crowdin (CONTRIBUTING.md) (#11094)Yusuke Nakamura
Restore and change from 89096860
2019-05-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-18Remove 'Weblate' from CONTRIBUTING.md (#10778)Yusuke Nakamura
The mastodon project no longer used weblate to translate UI sentences. (ref #10385)
2019-01-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - README.md: kept our version
2019-01-28Add note that contributors may request reimbursement through OpenCollective ↵Eugen Rochko
(#9933)
2018-10-22Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.
2018-10-19Update CONTRIBUTING.md (#9014)Eugen Rochko
* Update CONTRIBUTING.md * Update CONTRIBUTING.md * Update CONTRIBUTING.md * Update CONTRIBUTING.md
2018-05-04Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: CONTRIBUTING.md
2018-05-04Improve “how to translate” (#7358)Marcin Mikołajczak
2018-05-04Add translate guide to CONTRIBUTING.md (#7355)Yamagishi Kazutoshi
2017-07-14Added link to docs websiteGô Shoemake
2017-07-12Updated readme and contrib docskibigo!
2017-04-17README tidy up (#2026)Matt Jankowski
* Remove docker guide and put it in docs repo * Move tasks to docs repo * Move requirements to contributing doc * Move advice about tagged releases to docs repo * Move local domain and host config to docs repo * Link to related tech
2017-04-17Rubocop instructions (#1973)Matt Jankowski
* Rubocop link for Sublime Text * Fix rubocop links * Link to gh issues page from contributing doc
2017-04-12Request documentation (#1616)Shel R
This addition to the submission guidelines requests that contributors remember to document their code. It's not a hard fast rule just a reminder.
2017-04-02Corrected spelling mistakeNeville Park
2017-03-19Add link to contribution guidelines to READMEEugen Rochko
2017-03-19Added contribution guidelinesEugen Rochko
generated by cgit-pink (git 2.37.1) at 2024-11-01 16:07:12 +0000