272 Commits (1287de1b83c45a972248a1375078f63f61009109)

Author SHA1 Message Date
Eugen 78c1e2e958 Merge branch 'master' into patch-1
8 years ago
Eugen bdaf31bcc9 Merge branch 'master' into patch-1
8 years ago
Eugen f735efdbc1 Merge pull request #846 from TrollDecker/master
8 years ago
Eugen 1709dee0f1 Merge pull request #842 from Angristan/patch-2
8 years ago
Eugen 1c634ad21a Merge pull request #845 from thurloat/patch-1
8 years ago
Eugen 682c8a6fc8 Merge pull request #848 from ProgVal/patch-3
8 years ago
Eugen 66ec005bf8 Merge pull request #854 from Angristan/patch-3
8 years ago
Eugen d3dab68978 Merge pull request #891 from ashfurrow/patch-1
8 years ago
Eugen 417273326a Merge pull request #894 from asm/mastodon_cc
8 years ago
Ash Furrow dd441606aa Updates instructions.
8 years ago
Eugen feea517046 Merge pull request #872 from kwaio/patch-1
8 years ago
Jason Snell 50a88d6a6e Adding https://mastodon.cc
8 years ago
Ash Furrow 04225ed72e Adds instructions for adding admin users.
8 years ago
Udo Kramer 1e5a1b9abd Update Production-guide.md
8 years ago
Nope Nope dcda852b5f typo in admin doc
8 years ago
Angristan 6091b9b1a9 Add file package
8 years ago
Pierre Ozoux 41ba74b511 Update the list of instances
8 years ago
Valentin Lorentz 22000ef7a9 Add oc.todon.fr to the list of instances.
8 years ago
Sébastien Santoro 7015578655 Add social.nasqueron.org instance
8 years ago
Angristan 2fcf8d79ad Fix crontab edit
8 years ago
Jo Decker d8855150a0 Update social.diskseven.com's IPv6 status
8 years ago
Adam Thurlow 192f079776 Add mastodon.club to running instances list
8 years ago
Florian Maunier 58bdb9b42e Update List-of-Mastodon-instances.md
8 years ago
Angristan 665ec615e3 Missing quotes
8 years ago
Eugen 48dfdad492 Merge branch 'master' into patch-1
8 years ago
Eugen ed4a723a82 Merge pull request #800 from unascribed/patch-1
8 years ago
Eugen c359e60034 Merge pull request #799 from Wonderfall/master
8 years ago
Eugen 7c075b5551 Merge pull request #788 from yiskah/patch-5
8 years ago
Eugen 1e81cad3f3 Merge pull request #815 from walfie/patch-1
8 years ago
Leo Wzukw e81ba26be9 More consistent typography
8 years ago
walfie c22388fc79 Fix typo in Heroku guide
8 years ago
Eugen Rochko f722bd2387 Separate background jobs into different queues. ATTENTION: new queue "pull"
8 years ago
Alice 5b6f4fdeb4 Add octodon.social
8 years ago
Aesen 1ed37fae9b Add fern.surgeplay.com to the instances list
8 years ago
Wonderfall cc451e1fcb update social.targaryen.house info
8 years ago
shel 8a45a97e2e Add instances from instances.mastodon.xyz
8 years ago
wxcafé d06c810b16 Adds social.wxcafe.net
8 years ago
Kibigo! b455cbc6d3 "direct" in statuses#create
8 years ago
Kibigo! a9db64cf26 Forgot `direct` statuses :P
8 years ago
Kibigo! 5d2f1d600d Typofixes
8 years ago
Kibigo! 5d65aa3bf9 Code now code
8 years ago
Kibigo! 565568dd9c Merging 'upstream' updates
8 years ago
Kibigo! 6e41ef55ed Updated API docs
8 years ago
Eugen 3f650c06b6 Merge pull request #757 from yiskah/patch-4
8 years ago
Eugen 6b9c50117f Merge pull request #748 from ProgVal/patch-1
8 years ago
shel e2526a62e7 Add social.imirhil.fr
8 years ago
Eugen d7d60073f9 Merge pull request #744 from fpiesche/master
8 years ago
Valentin Lorentz 9ca548c17e Also fix the start command.
8 years ago
Valentin Lorentz 82ae07e48b Fix install instructions.
8 years ago
Michael Vieira b69e97c40b add link to another mastodon instance.
8 years ago
Florian Piesche 590558d52c Update images to standard sizes. Write up Federated/Local timelines and rename relevant image.
8 years ago
Florian Piesche e92796b49c Add info on CW tags not automatically hiding images.
8 years ago
Florian Piesche a729d0c2b1 Add user guide to README toc
8 years ago
Florian Piesche 60a82c9022 Update to catch up with new features and add missing images.
8 years ago
Florian Piesche b277e88aae Write up reporting.
8 years ago
Florian Piesche 03b2f37b46 Add information about the Direct privacy setting.
8 years ago
Florian Piesche 0f274589dd Add information on following remote users or using the Search box to find them.
8 years ago
TheKinrar 9f219d8968 Add link to instances.mastodon.xyz
8 years ago
Sina Mashek aaea7e1e7c Adding social.mashek.net
8 years ago
Eugen a2fa09518f Merge branch 'master' into patch-1
8 years ago
TheKinrar f5d434e433 Add IPv6 column in list and remove dead instance
8 years ago
jenn kaplan 1389d5d7fd Updated list of instances for gay.crime.team
8 years ago
Wonderfall 7ccc9b8b02
Add social.targaryen.house to instances list
8 years ago
TheKinrar 355168b939 Add mastodon.xyz to instances list
8 years ago
Alex Gleason d835647ec0 Put line breaks between API methods in docs
8 years ago
shel 5181702a60 Update amaroq name
8 years ago
shel dd64baeba2 Update Matador name to 11t
8 years ago
shel 38dceb3bf7 Promote Apps (#670)
8 years ago
Eugen Rochko 6be7bde243 Fix #525 - Add instance information API
8 years ago
Eugen e245115f47 Merge branch 'master' into mastodon-site-api
8 years ago
Eugen c1124228e8 Update list of apps
8 years ago
Eugen Rochko 02349b3269 Obfuscate filenames better, double rate limits
8 years ago
Eugen Rochko 5f4e402204 Improved /api/v1/accounts/:id/statuses with new params: only_media, exclude_replies
8 years ago
Alexander Acevedo 851b730373 add social.gestaltzerfall.net instance information
8 years ago
undrskr fac8bfc03f gnusocial.me doesn't use Mastodon anymore
8 years ago
shel b4a12c88e7 Add social.dickseven.com
8 years ago
Eugen 0327ab9616 Updated sponsors
8 years ago
Kibigo 620f70e42c Adds site metadata access to the API
8 years ago
Eugen Rochko 3e9d794ea5 Add tuning documentation, add <content> tags back to most salmons,
8 years ago
Florian Piesche dad204a54d Add user guide.
8 years ago
Eugen e571a01853 Fix outdated info
8 years ago
Tom McAtee 68dba5f2eb Fixed the URL
8 years ago
Eugen bae7cf8cce Merge pull request #630 from yiskah/patch-6
8 years ago
Eugen Rochko fae1799646 Add rake task for making someone into an admin
8 years ago
shel 7a99699e2d Add memetastic.space
8 years ago
Lorenz Diener 73210a93df Add https://icosahedron.website/
8 years ago
Effy Elden 0eee63f074 Remove toot.zone
8 years ago
Eugen Rochko 50660d54e8 Fix semantics of follow requests another slaps
8 years ago
Eugen Rochko 0b95eb3612 Improve docs
8 years ago
shel 894a0515d9 Add gnusocial.me to instance list
8 years ago
Eugen 874fffb7dc Merge branch 'master' into patch-3
8 years ago
shel a0e6c80b60 Clean up markdown
8 years ago
shel 63a18efb27 Change List of Instances to Table
8 years ago
Neville Park e9fa557ead Added awoo.space
8 years ago
Eugen Rochko aa1213e089 Add postgres setup instructions to docs
8 years ago
Eugen Rochko 77e13c2bc9 Removing failed push notification API, make context loads use cache
8 years ago
Eugen Rochko ccb8ac8573 Make the streaming API also handle websockets (because trying to get the browser EventSource interface to
8 years ago
James 7b7a356aed fix extraneous text in 2fa readme (#592)
8 years ago
Eugen 9cf7da4934 Add tootyfruity
8 years ago
Eugen 9faf4c9dea Update Sponsors.md
8 years ago
Eugen 1511efc8d2 Update Sponsors.md
8 years ago
Eugen d33dfce34f Updated list of top sponsors
8 years ago
Eugen Rochko aa2fa227e9 Adding documentation for streaming API. Fixing filtering bug
8 years ago
Eugen Rochko d9ca46b464 Cleaning up format of broadcast real-time messages, removing
8 years ago
James b12bdd2aea Add 2-FA instructions for non-technical users (#580)
8 years ago
Eugen 2165a0ec63 Update some API docs
8 years ago
Eugen Rochko aa52d5fd1e Add more links to main docs page
8 years ago
Eugen Rochko ca8a9d5941 Fix JSON formatting in docs
8 years ago
Eugen Rochko fe9306f346 Update docs with information about push notifications
8 years ago
Eugen Rochko dc3e0529ca Update broken links, add new sponsor
8 years ago
nicolas 9f57c7d4a6 Updated translation doc to get working links
8 years ago
Eugen 87667e371c Merge pull request #549 from ineffyble/docs/add-default-account-to-dev-documentation
8 years ago
Christian Walde 12eddb5cbe document that /oauth/token does not always return json
8 years ago
Effy Elden ae2147d40f Add default account details to developer documentation.
8 years ago
Christian Walde 3b6af5245b clarify the intended use of the oauth api call as per this issue:
8 years ago
Eugen Rochko 3beb24ad55 Use <summary> to encode content warnings instead
8 years ago
Eugen Rochko ca04002c93 Add content warning example to docs
8 years ago
Eugen Rochko ab94ad3504 Add description of Mastodon's current protocol extensions
8 years ago
Effy Elden 92a98f73aa Add separate sections for Heroku and Vagrant deployments. Add guide for instance administration. Move 'Contribution guide' to 'Development guide'.
8 years ago
Eugen Rochko 536cde4e99 Rename main docs page so it renders in github
8 years ago
Eugen Rochko 2baf0fabb4 Improve API docs formatting
8 years ago
Eugen Rochko e92a1cf436 Add wiki contents to docs/ instead
8 years ago