hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,513 Commits
7 Branches
0 Tags
179 MiB
Commit Graph

15 Commits (663593b508e419cb1a4f9f93ce75e0065e0833d4)

Author SHA1 Message Date
Thibaut Girka 42713b9710 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- README.md: kept our version
 2019-01-28 21:14:47 +01:00
Eugen Rochko d4300c3b98
Add note that contributors may request reimbursement through OpenCollective (#9933) 2019-01-28 04:17:11 +01:00
Thibaut Girka dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream 
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-22 17:51:38 +02:00
Eugen Rochko 890968603b
Update CONTRIBUTING.md (#9014) 
* Update CONTRIBUTING.md

* Update CONTRIBUTING.md

* Update CONTRIBUTING.md

* Update CONTRIBUTING.md
 2018-10-19 16:41:25 +02:00
David Yip b316d373ea
Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	CONTRIBUTING.md
 2018-05-04 12:16:12 -05:00
Marcin Mikołajczak d181aad033 Improve “how to translate” (#7358) 2018-05-04 18:37:37 +02:00
Yamagishi Kazutoshi 00ff8dc00a Add translate guide to CONTRIBUTING.md (#7355) 2018-05-04 18:01:12 +02:00
Gô Shoemake 51e3ac2534 Added link to docs website 2017-07-14 09:42:50 -07:00
kibigo! 2e0645c26c Updated readme and contrib docs 2017-07-12 23:55:55 -07:00
Matt Jankowski fc122e9d78 README tidy up (#2026) 
* 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-17 21:28:31 +02:00
Matt Jankowski a67909ec1e Rubocop instructions (#1973) 
* Rubocop link for Sublime Text

* Fix rubocop links

* Link to gh issues page from contributing doc
 2017-04-17 10:35:42 +02:00
Shel R 9e63bf446e Request documentation (#1616) 
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-12 18:27:33 +02:00
Neville Park 54c796c8df Corrected spelling mistake 2017-04-02 13:01:55 -04:00
Eugen Rochko 8c7277acd4 Add link to contribution guidelines to README 2017-03-19 04:05:19 +01:00
Eugen Rochko 50f3a81f63 Added contribution guidelines 2017-03-19 03:52:21 +01:00