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.
3 years ago
31593d1426
Update CodeClimate badge in README ( #16501 )
3 years ago
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
3 years ago
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
4 years ago
e92f312aab
Change Node.js requirement in README ( #16246 )
4 years ago
bf74a7e06d
Update copyright year ( #16003 )
4 years ago
44a19fd96d
Fix translation platform to Crowdin ( #13443 )
5 years ago
b5dace62b0
Decommission support for Ruby 2.4 ( #13287 )
...
* Update Gemfile
* Update README.md
5 years ago
dcf7d86378
2019 -> 2020 ( #12867 )
...
happy new year 🎉
5 years ago
c10ff359a2
Require nodejs 10.13 as minimum release. ( #12791 )
...
* Update package.json
* Update README.md
5 years ago
db530966f7
Update link to install docs ( #12666 )
5 years ago
1e96f7d067
Edit introduction of README.md ( #12372 )
...
The introductory paragraph has been edited to be more cohesive.
5 years ago
d3145ced1f
Update README.md ( #12164 )
5 years ago
efda126914
Fix spelling error in README ( #12086 )
...
fix a spelling error
5 years ago
1390da501d
Change translations badge in README to Crowdin ( #11054 )
6 years ago
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.
6 years ago
d4300c3b98
Add note that contributors may request reimbursement through OpenCollective ( #9933 )
6 years ago
3abab56650
Improve README ( #9012 )
...
* Improve README
* Update README.md
* Update README.md
* Update README.md
* Update README.md
6 years ago
76b8ae044d
Fix build status link in README.md
...
It was still linking to Travis, oops.
6 years ago
a8de13c031
Fix CI badge, as we have switched from Travis to CircleCI
6 years ago
447d733913
Update README.md
...
Add link to quick start guide, link to general documentation, fix link to list of servers, remove Liberapay
6 years ago
988befb059
Add weblate widget to README
6 years ago
78f036b7d2
Remove reference to BTC, update video link
6 years ago
9b8bb2a5df
Replace badge to CircleCI ( #7216 )
7 years ago
56333cca88
Add license info to README ( #6583 )
...
* Add license info to README
* Reference AUTHORS file
7 years ago
3a6ace4874
Add Liberapay link to README.md ( #6563 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
5df8e30415
fix Code Climate badge on README.md ( #5671 )
...
and change badge's URI to https
7 years ago
a3d4f1bd93
Update outdated README ( #5262 )
7 years ago
8150689b48
Merge upstream ( #111 )
7 years ago
7905739c2a
s/PubSubHubbub/WebSub/g ( #4372 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
dd28b557ae
Update README header with logo
7 years ago
144db8ea1d
poke and visible docs url
7 years ago
2e0645c26c
Updated readme and contrib docs
7 years ago
0e310f1ee3
put travis thing in readme.md
7 years ago
09f7ad3614
silly readme update to test automated deploys
8 years ago
7c2ea42cd5
update README.md
8 years ago
ea785d0baf
Update README.md
8 years ago
d3bbef27e7
Fix broken screenshot
8 years ago
53c2274d48
Update screenshot in readme ( #2978 )
8 years ago
e37e84d210
Fixes #1830 adds link to development guide ( #2783 )
8 years ago
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
8 years ago
833bfd77f2
Added missing `rake secret` command ( #1894 )
8 years ago
42c9d5111a
Add README note about tagged releases ( #1927 )
8 years ago
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
8 years ago
e17b5b228d
Improve docker update instructions ( #1619 )
8 years ago
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
8 years ago
1236529e39
Moving docs to tootsuite/documentation ( #1550 )
8 years ago
a283786463
Add note about minimum docker-compose version ( #1264 )
...
Add a note to ensure users are using the right version of docker-compose.
8 years ago
2c0ef75f58
fixed a sentence in readme
8 years ago
ed2bfdee67
add Docker microbadger to README.md
8 years ago
Claire
Eugen Rochko
Valentin Lorentz
Sean
Yamagishi Kazutoshi
Shlee
Stéphane Guillou
trwnh
sclaire-1
BenisonSebastian
Mareena Kunjachan
Sam Schlinkert
Thibaut Girka
TrashMacNugget
Marcin Mikołajczak
takayamaki
kibigo!
beatrix
beatrix
Brian Mock
Matt Jankowski
Expenses
Ian Kelling
Eric Blade
Effy Elden
rbaumert
Wonderfall