luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-05 14:36:04 +00:00
Code Issues Projects Releases Wiki Activity
13982 commits 1 branch 0 tags 248 MiB
Commit graph

95 commits

Author SHA1 Message Date
Claire fc500a6062 Merge branch 'main' into glitch-soc/merge-upstream 
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-13 17:57:15 +02:00
Eugen Rochko 31593d1426
Update CodeClimate badge in README (#16501) 2021-07-13 16:02:15 +02:00
Claire 5a1e072517
Change references to tootsuite/mastodon to mastodon/mastodon (#16491) 
* 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-07-13 15:46:20 +02:00
Valentin Lorentz 16b524feb6
Change IRC channel to LiberaChat in README (#16279) 
Freenode was taken over by a different entity, and former Freenode
staff created LiberaChat.

Short summary of the situation: https://blog.bofh.it/debian/id_461

With more details:

* https://gist.github.com/joepie91/df80d8d36cd9d1bde46ba018af497409
* https://gist.github.com/aaronmdjones/1a9a93ded5b7d162c3f58bdd66b8f491
 2021-05-24 05:16:45 +02:00
Eugen Rochko e92f312aab
Change Node.js requirement in README (#16246) 2021-05-16 23:09:12 +02:00
Sean bf74a7e06d
Update copyright year (#16003) 2021-04-06 11:38:21 +02:00
Yamagishi Kazutoshi 44a19fd96d
Fix translation platform to Crowdin (#13443) 2020-04-10 08:24:23 +02:00
Shlee b5dace62b0
Decommission support for Ruby 2.4 (#13287) 
* Update Gemfile

* Update README.md
 2020-03-21 03:10:24 +01:00
Stéphane Guillou dcf7d86378 2019 -> 2020 (#12867) 
happy new year 🎉
 2020-01-14 11:20:13 +01:00
Shlee c10ff359a2 Require nodejs 10.13 as minimum release. (#12791) 
* Update package.json

* Update README.md
 2020-01-11 11:53:36 +01:00
trwnh db530966f7 Update link to install docs (#12666) 2019-12-22 22:22:09 +01:00
sclaire-1 1e96f7d067 Edit introduction of README.md (#12372) 
The introductory paragraph has been edited to be more cohesive.
 2019-11-13 13:54:47 +01:00
BenisonSebastian d3145ced1f Update README.md (#12164) 2019-10-24 22:48:21 +02:00
Mareena Kunjachan efda126914 Fix spelling error in README (#12086) 
fix a spelling error
 2019-10-06 21:36:26 +02:00
Eugen Rochko 1390da501d
Change translations badge in README to Crowdin (#11054) 2019-06-12 15:56:41 +02:00
Sam Schlinkert 7e81bca500 Bumps copyright year in README.md to 2019 (#9939) 
This is so incredibly small, but assuming this is a needed change. Might want to check year in other files.
 2019-01-28 22:57:42 +01:00
Eugen Rochko d4300c3b98
Add note that contributors may request reimbursement through OpenCollective (#9933) 2019-01-28 04:17:11 +01:00
Eugen Rochko 3abab56650
Improve README (#9012) 
* Improve README

* Update README.md

* Update README.md

* Update README.md

* Update README.md
 2018-10-19 18:49:35 +02:00
Thibaut Girka 76b8ae044d Fix build status link in README.md 
It was still linking to Travis, oops.
 2018-09-28 21:18:04 +02:00
Thibaut Girka a8de13c031 Fix CI badge, as we have switched from Travis to CircleCI 2018-09-03 17:41:28 +02:00
Eugen Rochko 447d733913
Update README.md 
Add link to quick start guide, link to general documentation, fix link to list of servers, remove Liberapay
 2018-09-02 18:32:25 +02:00
Eugen Rochko 988befb059
Add weblate widget to README 2018-09-02 14:41:46 +02:00
Eugen Rochko 78f036b7d2
Remove reference to BTC, update video link 2018-07-05 21:02:21 +02:00
Yamagishi Kazutoshi 9b8bb2a5df Replace badge to CircleCI (#7216) 2018-04-21 21:56:40 +02:00
TrashMacNugget 56333cca88 Add license info to README (#6583) 
* Add license info to README

* Reference AUTHORS file
 2018-03-11 15:12:23 +01:00
Marcin Mikołajczak 3a6ace4874 Add Liberapay link to README.md (#6563) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-02-26 16:20:47 +01:00
takayamaki 5df8e30415 fix Code Climate badge on README.md (#5671) 
and change badge's URI to https
 2017-11-13 11:49:54 +09:00
Eugen Rochko a3d4f1bd93 Update outdated README (#5262) 2017-10-07 21:20:59 +02:00
kibigo! 8150689b48 Merge upstream (#111) 2017-08-01 13:20:29 -07:00
m4sk1n 7905739c2a s/PubSubHubbub/WebSub/g (#4372) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-07-26 13:47:41 +02:00
Eugen Rochko dd28b557ae Update README header with logo 2017-07-23 02:46:10 +02:00
kibigo! 144db8ea1d poke and visible docs url 2017-07-15 15:34:46 -07:00
kibigo! 2e0645c26c Updated readme and contrib docs 2017-07-12 23:55:55 -07:00
beatrix 0e310f1ee3 put travis thing in readme.md 2017-06-30 12:36:10 -04:00
beatrix-bitrot 09f7ad3614 silly readme update to test automated deploys 2017-06-23 21:45:14 +00:00
beatrix-bitrot 7c2ea42cd5 update README.md 2017-06-23 21:45:14 +00:00
beatrix ea785d0baf Update README.md 2017-06-23 21:45:14 +00:00
Eugen Rochko d3bbef27e7 Fix broken screenshot 2017-06-07 17:53:47 +02:00
Eugen Rochko 53c2274d48 Update screenshot in readme (#2978) 2017-05-11 02:57:30 +02:00
Brian Mock e37e84d210 Fixes #1830 adds link to development guide (#2783) 2017-05-04 15:50:36 +02: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
Expenses 833bfd77f2 Added missing rake secret command (#1894) 2017-04-17 10:38:59 +02:00
Eugen 42c9d5111a Add README note about tagged releases (#1927) 2017-04-16 16:42:46 +02:00
Ian Kelling 4445ebdad2 Fix getting started commands out of order (#1737) 
In current order, docker-compose build results in
ERROR: Couldn't find env file: /a/hopt/mastodon/.env.production
 2017-04-14 11:04:19 +02:00
Eugen e17b5b228d Improve docker update instructions (#1619) 2017-04-12 19:34:40 +02:00
Eric Blade 3442bc0ea3 update Docker section of README (#1231) 
Re-ordered the steps so it doesn't read "Do this, but first, do this
other step"
Added note about keeping the REDIS and DB settings as they are for
Docker use
Add which variables you will NEED to set to make the Mastodon work
Add how to generate the secrets
Add how to connect to your Mastodon
Add a note to read the Production-guide
 2017-04-12 01:14:56 +02:00
Eugen 1236529e39 Moving docs to tootsuite/documentation (#1550) 2017-04-11 12:03:02 -04:00
Effy Elden a283786463 Add note about minimum docker-compose version (#1264) 
Add a note to ensure users are using the right version of docker-compose.
 2017-04-11 00:39:39 +02:00
rbaumert 2c0ef75f58 fixed a sentence in readme 2017-04-07 19:48:46 -07:00
Wonderfall ed2bfdee67
add Docker microbadger to README.md 2017-04-06 20:59:20 +02:00