c3f46d6b28
Merge branch 'master' of https://framagit.org/tykayn/mastodon into merged-master
2020-07-17 20:49:44 +02:00
Yamagishi Kazutoshi
44a19fd96d
Fix translation platform to Crowdin ( #13443 )
2020-04-10 08:24:23 +02:00
e50cb7160a
🐛 add icons in dropdown menu, fix style for this dropdown
...
Merge remote-tracking branch 'origin'
Signed-off-by: Baptiste Lemoine <contact@cipherbliss.com>
# Conflicts:
# .ruby-version
# app/javascript/mastodon/components/status.js
# app/javascript/mastodon/features/direct_timeline/components/conversation.js
# app/javascript/mastodon/features/getting_started/components/announcements.js
# app/javascript/mastodon/locales/fr.json
# config/locales/kab.yml
# config/locales/ta.yml
# yarn.lock
2020-04-09 17:33:58 +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
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
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
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
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
Jonathan Hurter
d6bab0c71c
Add doc
2017-04-05 16:00:48 +02:00
Jonathan Hurter
5e7ec0fe57
Use root repository url
2017-04-05 15:52:06 +02:00
Jonathan Hurter
152a1e578c
Add Scalingo one click on readme
2017-04-05 15:33:19 +02:00
Alex Gleason
e4c10b32b3
Mastodon is not an alternative, it is a solution
...
This month I traveled to Cambridge, Massachusetts with my friends and attended LibrePlanet 2017. At the talk *Technology for direct actions*, Andrew Seeder pointed out that we often call free software an "alternative" to what exists. But an alternative is something that is mostly similar, and differentiated by preference rather than need. For instance, a trackball is an alternative to a mouse, but a jail is not an alternative to a bedroom. Andrew suggested that we start looking at free software as "solutions" rather than alternatives. So I propose boldly proclaiming that Mastodon is not an alternative to Twitter, but rather a solution to it.
2017-03-31 10:34:21 -04:00
Eugen Rochko
8c7277acd4
Add link to contribution guidelines to README
2017-03-19 04:05:19 +01:00
Eugen Rochko
dc3e0529ca
Update broken links, add new sponsor
2017-01-27 17:01:21 +01:00
Effy Elden
f3cac0b93b
Update README.md to match new documentation (missed from previous commit)
2017-01-23 00:11:09 +11:00
Eugen Rochko
e92a1cf436
Add wiki contents to docs/ instead
2017-01-21 22:51:02 +01:00
Effy Elden
ab4f5f5da5
Add Heroku deployment support
2017-01-17 22:00:03 +11:00
Effy Elden
f876a8681d
Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places
2017-01-11 13:24:14 +11:00
Eugen
a1db2a191b
Add link to list of apps
2017-01-10 12:23:30 +01:00
Eugen
db8a088502
Update badges
2017-01-08 03:47:33 +01:00
Effy Elden
11ea7336e9
Tweak Vagrant info in README
2017-01-08 01:30:48 +11:00