0495e0642e
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
83d7f4785f
Update CodeClimate badge in README ( #16501 )
2021-07-13 16:02:15 +02:00
ab4c1478b6
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
bd884781e0
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
343bf6708e
Change Node.js requirement in README ( #16246 )
2021-05-16 23:09:12 +02:00
bbe7fcf267
Update copyright year ( #16003 )
2021-04-06 11:38:21 +02:00
145a043dbe
Fix translation platform to Crowdin ( #13443 )
2020-04-10 08:24:23 +02:00
d3bb6a296c
Decommission support for Ruby 2.4 ( #13287 )
...
* Update Gemfile
* Update README.md
2020-03-21 03:10:24 +01:00
f0991a357c
2019 -> 2020 ( #12867 )
...
happy new year 🎉
2020-01-14 11:20:13 +01:00
1d3f85f036
Require nodejs 10.13 as minimum release. ( #12791 )
...
* Update package.json
* Update README.md
2020-01-11 11:53:36 +01:00
fac09492c4
Update link to install docs ( #12666 )
2019-12-22 22:22:09 +01:00
d3e190b96d
Edit introduction of README.md ( #12372 )
...
The introductory paragraph has been edited to be more cohesive.
2019-11-13 13:54:47 +01:00
6a337237a2
Update README.md ( #12164 )
2019-10-24 22:48:21 +02:00
84308bc352
Fix spelling error in README ( #12086 )
...
fix a spelling error
2019-10-06 21:36:26 +02:00
f3494d62f0
Change translations badge in README to Crowdin ( #11054 )
2019-06-12 15:56:41 +02:00
178176966e
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
3b5b6d19f5
Add note that contributors may request reimbursement through OpenCollective ( #9933 )
2019-01-28 04:17:11 +01:00
34c7bdfa1f
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
3e1d2c70f7
Fix build status link in README.md
...
It was still linking to Travis, oops.
2018-09-28 21:18:04 +02:00
725735af14
Fix CI badge, as we have switched from Travis to CircleCI
2018-09-03 17:41:28 +02:00
2b99bba92c
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
5facd13c76
Add weblate widget to README
2018-09-02 14:41:46 +02:00
8bd9a6d9ba
Remove reference to BTC, update video link
2018-07-05 21:02:21 +02:00
308be04040
Replace badge to CircleCI ( #7216 )
2018-04-21 21:56:40 +02:00
1526661329
Add license info to README ( #6583 )
...
* Add license info to README
* Reference AUTHORS file
2018-03-11 15:12:23 +01:00
cfa4c40e04
Add Liberapay link to README.md ( #6563 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-02-26 16:20:47 +01:00
39bffb4fae
fix Code Climate badge on README.md ( #5671 )
...
and change badge's URI to https
2017-11-13 11:49:54 +09:00
7c9fa3d9ba
Update outdated README ( #5262 )
2017-10-07 21:20:59 +02:00
2cdee6ae8a
Merge upstream ( #111 )
2017-08-01 13:20:29 -07:00
346faaec2b
s/PubSubHubbub/WebSub/g ( #4372 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-07-26 13:47:41 +02:00
89a7c2ea8c
Update README header with logo
2017-07-23 02:46:10 +02:00
e85716602c
poke and visible docs url
2017-07-15 15:34:46 -07:00
6574cab679
Updated readme and contrib docs
2017-07-12 23:55:55 -07:00
04cef23c67
put travis thing in readme.md
2017-06-30 12:36:10 -04:00
8288ed1cfc
silly readme update to test automated deploys
2017-06-23 21:45:14 +00:00
65914d509f
update README.md
2017-06-23 21:45:14 +00:00
91b9bfbb11
Update README.md
2017-06-23 21:45:14 +00:00
2c3de601e6
Fix broken screenshot
2017-06-07 17:53:47 +02:00
d7ca846ba8
Update screenshot in readme ( #2978 )
2017-05-11 02:57:30 +02:00
6bbf4b89bb
Fixes #1830 adds link to development guide ( #2783 )
2017-05-04 15:50:36 +02:00
98b6c5c0d4
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
700244b73d
Added missing `rake secret` command ( #1894 )
2017-04-17 10:38:59 +02:00
097041b15b
Add README note about tagged releases ( #1927 )
2017-04-16 16:42:46 +02:00
b0aec511ab
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
fa7da41127
Improve docker update instructions ( #1619 )
2017-04-12 19:34:40 +02:00
e3e70bab94
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
4d876e9453
Moving docs to tootsuite/documentation ( #1550 )
2017-04-11 12:03:02 -04:00
2acd794309
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
9075862af1
fixed a sentence in readme
2017-04-07 19:48:46 -07:00
9e2f235405
add Docker microbadger to README.md
2017-04-06 20:59:20 +02:00
Claire