272 Commits (e054961051c758c7b247beb164e9fd91d136a801)

Author SHA1 Message Date
Eugen 49cd7f7fc4 Merge branch 'master' into patch-1
8 years ago
Eugen 4390ae7bf9 Merge branch 'master' into patch-1
8 years ago
Eugen 7603a1d5d2 Merge pull request #846 from TrollDecker/master
8 years ago
Eugen 0662ab35eb Merge pull request #842 from Angristan/patch-2
8 years ago
Eugen 9c47a07dfa Merge pull request #845 from thurloat/patch-1
8 years ago
Eugen 3340074137 Merge pull request #848 from ProgVal/patch-3
8 years ago
Eugen b3523a6a8d Merge pull request #854 from Angristan/patch-3
8 years ago
Eugen ae1b33d594 Merge pull request #891 from ashfurrow/patch-1
8 years ago
Eugen dd839491b6 Merge pull request #894 from asm/mastodon_cc
8 years ago
Ash Furrow bd371b6adb Updates instructions.
8 years ago
Eugen a5f1a6bf01 Merge pull request #872 from kwaio/patch-1
8 years ago
Jason Snell 1771eea458 Adding https://mastodon.cc
8 years ago
Ash Furrow 5e8e8ba01d Adds instructions for adding admin users.
8 years ago
Udo Kramer cfa339d3ff Update Production-guide.md
8 years ago
Nope Nope 583208f5ae typo in admin doc
8 years ago
Angristan 1447ba504b Add file package
8 years ago
Pierre Ozoux ecbda73b27 Update the list of instances
8 years ago
Valentin Lorentz 3187e1b398 Add oc.todon.fr to the list of instances.
8 years ago
Sébastien Santoro 8db8132504 Add social.nasqueron.org instance
8 years ago
Angristan 3ab29e5a9d Fix crontab edit
8 years ago
Jo Decker f9c2d86945 Update social.diskseven.com's IPv6 status
8 years ago
Adam Thurlow acc597fa98 Add mastodon.club to running instances list
8 years ago
Florian Maunier 53b2df62dd Update List-of-Mastodon-instances.md
8 years ago
Angristan aee8798179 Missing quotes
8 years ago
Eugen db5149b963 Merge branch 'master' into patch-1
8 years ago
Eugen 7f543e1fca Merge pull request #800 from unascribed/patch-1
8 years ago
Eugen 180aab6e2e Merge pull request #799 from Wonderfall/master
8 years ago
Eugen b9c1c5bdd0 Merge pull request #788 from yiskah/patch-5
8 years ago
Eugen 4068de0eed Merge pull request #815 from walfie/patch-1
8 years ago
Leo Wzukw cb21bf5b40 More consistent typography
8 years ago
walfie 766eabf194 Fix typo in Heroku guide
8 years ago
Eugen Rochko 8eca42b265 Separate background jobs into different queues. ATTENTION: new queue "pull"
8 years ago
Alice c2787014e5 Add octodon.social
8 years ago
Aesen 9a4a766ab3 Add fern.surgeplay.com to the instances list
8 years ago
Wonderfall e27807e8e9 update social.targaryen.house info
8 years ago
shel 37863b45a3 Add instances from instances.mastodon.xyz
8 years ago
wxcafé 5c269d3e0e Adds social.wxcafe.net
8 years ago
Kibigo! dac1ca1e40 "direct" in statuses#create
8 years ago
Kibigo! 145493fd4c Forgot `direct` statuses :P
8 years ago
Kibigo! a9f7e93396 Typofixes
8 years ago
Kibigo! db554277b9 Code now code
8 years ago
Kibigo! 034f60b5c4 Merging 'upstream' updates
8 years ago
Kibigo! 0b99777853 Updated API docs
8 years ago
Eugen c385fc5d3c Merge pull request #757 from yiskah/patch-4
8 years ago
Eugen ebd4650511 Merge pull request #748 from ProgVal/patch-1
8 years ago
shel fd51b1a2a5 Add social.imirhil.fr
8 years ago
Eugen 97a75cc942 Merge pull request #744 from fpiesche/master
8 years ago
Valentin Lorentz 02fac04fc5 Also fix the start command.
8 years ago
Valentin Lorentz e089c66083 Fix install instructions.
8 years ago
Michael Vieira 621b595c46 add link to another mastodon instance.
8 years ago
Florian Piesche 567587b789 Update images to standard sizes. Write up Federated/Local timelines and rename relevant image.
8 years ago
Florian Piesche 9586becc7f Add info on CW tags not automatically hiding images.
8 years ago
Florian Piesche 4404c223a2 Add user guide to README toc
8 years ago
Florian Piesche 9cc9321935 Update to catch up with new features and add missing images.
8 years ago
Florian Piesche b5be221637 Write up reporting.
8 years ago
Florian Piesche dfcd9a3a5c Add information about the Direct privacy setting.
8 years ago
Florian Piesche 62d639bb27 Add information on following remote users or using the Search box to find them.
8 years ago
TheKinrar ef40b260f3 Add link to instances.mastodon.xyz
8 years ago
Sina Mashek aa72831d14 Adding social.mashek.net
8 years ago
Eugen 5b39827c82 Merge branch 'master' into patch-1
8 years ago
TheKinrar e7840652bb Add IPv6 column in list and remove dead instance
8 years ago
jenn kaplan 9460fa9d10 Updated list of instances for gay.crime.team
8 years ago
Wonderfall 77d3ed5be3 Add social.targaryen.house to instances list
8 years ago
TheKinrar 4bb2888a9d Add mastodon.xyz to instances list
8 years ago
Alex Gleason f62b7faa17 Put line breaks between API methods in docs
8 years ago
shel 3656972cea Update amaroq name
8 years ago
shel ee55d5fabb Update Matador name to 11t
8 years ago
shel 5c7b222769 Promote Apps (#670)
8 years ago
Eugen Rochko c97f817e40 Fix #525 - Add instance information API
8 years ago
Eugen 6599b27b2b Merge branch 'master' into mastodon-site-api
8 years ago
Eugen d100a6148e Update list of apps
8 years ago
Eugen Rochko 453d65e6da Obfuscate filenames better, double rate limits
8 years ago
Eugen Rochko d1e1f26878 Improved /api/v1/accounts/:id/statuses with new params: only_media, exclude_replies
8 years ago
Alexander Acevedo 4dc21d0482 add social.gestaltzerfall.net instance information
8 years ago
undrskr a0f4ebedf6 gnusocial.me doesn't use Mastodon anymore
8 years ago
shel 7ed683a1d9 Add social.dickseven.com
8 years ago
Eugen cbc4c1c3fa Updated sponsors
8 years ago
Kibigo b39356835b Adds site metadata access to the API
8 years ago
Eugen Rochko 5157e25aab Add tuning documentation, add <content> tags back to most salmons,
8 years ago
Florian Piesche ef9403e744 Add user guide.
8 years ago
Eugen 02332f452c Fix outdated info
8 years ago
Tom McAtee 525d615fd7 Fixed the URL
8 years ago
Eugen 2bdd46cc26 Merge pull request #630 from yiskah/patch-6
8 years ago
Eugen Rochko 1e94617a09 Add rake task for making someone into an admin
8 years ago
shel b2ecb316ef Add memetastic.space
8 years ago
Lorenz Diener d315966c70 Add https://icosahedron.website/
8 years ago
Effy Elden 92ca519ac4 Remove toot.zone
8 years ago
Eugen Rochko db53bfd30e Fix semantics of follow requests another slaps
8 years ago
Eugen Rochko f05f545a58 Improve docs
8 years ago
shel e352fb35a5 Add gnusocial.me to instance list
8 years ago
Eugen caf2b68730 Merge branch 'master' into patch-3
8 years ago
shel c4036234a1 Clean up markdown
8 years ago
shel 98f3eb884c Change List of Instances to Table
8 years ago
Neville Park 573a0d9149 Added awoo.space
8 years ago
Eugen Rochko 78552ab850 Add postgres setup instructions to docs
8 years ago
Eugen Rochko 2f126b1225 Removing failed push notification API, make context loads use cache
8 years ago
Eugen Rochko 9bd2b6be86 Make the streaming API also handle websockets (because trying to get the browser EventSource interface to
8 years ago
James 702623b347 fix extraneous text in 2fa readme (#592)
8 years ago
Eugen 0a19f0b2c8 Add tootyfruity
8 years ago
Eugen d693e338b8 Update Sponsors.md
8 years ago
Eugen 11496d174a Update Sponsors.md
8 years ago
Eugen 603c00684d Updated list of top sponsors
8 years ago
Eugen Rochko b860cbcbdf Adding documentation for streaming API. Fixing filtering bug
8 years ago
Eugen Rochko 727d236fcc Cleaning up format of broadcast real-time messages, removing
8 years ago
James 32ff6edba1 Add 2-FA instructions for non-technical users (#580)
8 years ago
Eugen e05d1b9b7c Update some API docs
8 years ago
Eugen Rochko e04c691737 Add more links to main docs page
8 years ago
Eugen Rochko 0cbb2535e4 Fix JSON formatting in docs
8 years ago
Eugen Rochko e149b2b779 Update docs with information about push notifications
8 years ago
Eugen Rochko 043cc6a741 Update broken links, add new sponsor
8 years ago
nicolas 597f547352 Updated translation doc to get working links
8 years ago
Eugen 380ddcdebf Merge pull request #549 from ineffyble/docs/add-default-account-to-dev-documentation
8 years ago
Christian Walde 43075a246e document that /oauth/token does not always return json
8 years ago
Effy Elden 0a909f2e6b Add default account details to developer documentation.
8 years ago
Christian Walde fbfaf0663f clarify the intended use of the oauth api call as per this issue:
8 years ago
Eugen Rochko 4d011ee829 Use <summary> to encode content warnings instead
8 years ago
Eugen Rochko 2627571ba4 Add content warning example to docs
8 years ago
Eugen Rochko 92b8fc56a8 Add description of Mastodon's current protocol extensions
8 years ago
Effy Elden 65748b7623 Add separate sections for Heroku and Vagrant deployments. Add guide for instance administration. Move 'Contribution guide' to 'Development guide'.
8 years ago
Eugen Rochko 446cce198b Rename main docs page so it renders in github
8 years ago
Eugen Rochko 7769fb6a5a Improve API docs formatting
8 years ago
Eugen Rochko 954f82410c Add wiki contents to docs/ instead
8 years ago