Commit graph

272 commits

Author SHA1 Message Date
Eugen
49cd7f7fc4 Merge branch 'master' into patch-1 2017-04-05 03:19:14 +02:00
Eugen
4390ae7bf9 Merge branch 'master' into patch-1 2017-04-05 03:18:42 +02:00
Eugen
7603a1d5d2 Merge pull request #846 from TrollDecker/master
Update social.diskseven.com's IPv6 status
2017-04-05 03:08:59 +02:00
Eugen
0662ab35eb Merge pull request #842 from Angristan/patch-2
Missing quotes
2017-04-05 03:08:24 +02:00
Eugen
9c47a07dfa Merge pull request #845 from thurloat/patch-1
Add mastodon.club to running instances list
2017-04-05 03:07:59 +02:00
Eugen
3340074137 Merge pull request #848 from ProgVal/patch-3
Add oc.todon.fr to the list of instances.
2017-04-05 03:07:46 +02:00
Eugen
b3523a6a8d Merge pull request #854 from Angristan/patch-3
Fix crontab edit
2017-04-05 03:07:28 +02:00
Eugen
ae1b33d594 Merge pull request #891 from ashfurrow/patch-1
Adds instructions for adding admin users for Heroku installs
2017-04-05 03:01:43 +02:00
Eugen
dd839491b6 Merge pull request #894 from asm/mastodon_cc
Adding https://mastodon.cc
2017-04-05 02:56:54 +02:00
Ash Furrow
bd371b6adb Updates instructions. 2017-04-04 20:53:31 -04:00
Eugen
a5f1a6bf01 Merge pull request #872 from kwaio/patch-1
typo in admin doc
2017-04-05 02:53:09 +02:00
Jason Snell
1771eea458 Adding https://mastodon.cc 2017-04-04 16:35:57 -07:00
Ash Furrow
5e8e8ba01d Adds instructions for adding admin users. 2017-04-04 18:45:24 -04:00
Udo Kramer
cfa339d3ff Update Production-guide.md 2017-04-04 23:45:29 +02:00
Nope Nope
583208f5ae typo in admin doc
s/rails/rake/
2017-04-04 20:45:32 +02:00
Angristan
1447ba504b Add file package
If the file package is not installed, we get "Validation failed: File has contents that are not what they are reported to be" when upload media.
2017-04-04 19:23:53 +02:00
Pierre Ozoux
ecbda73b27 Update the list of instances 2017-04-04 17:28:29 +01:00
Valentin Lorentz
3187e1b398 Add oc.todon.fr to the list of instances.
[SKIP CI]
2017-04-04 18:11:41 +02:00
Sébastien Santoro
8db8132504 Add social.nasqueron.org instance 2017-04-04 18:11:14 +02:00
Angristan
3ab29e5a9d Fix crontab edit
Missing -u parameter to specify the mastodon user.
2017-04-04 17:23:56 +02:00
Jo Decker
f9c2d86945 Update social.diskseven.com's IPv6 status
As far as I'm aware, my instance should be supporting IPv6 now. Was an error on my part that it wasn't working before.
2017-04-04 15:29:07 +01:00
Adam Thurlow
acc597fa98 Add mastodon.club to running instances list 2017-04-04 11:14:51 -03:00
Florian Maunier
53b2df62dd Update List-of-Mastodon-instances.md
Add my own instance
2017-04-04 16:03:05 +02:00
Angristan
aee8798179 Missing quotes 2017-04-04 15:57:37 +02:00
Eugen
db5149b963 Merge branch 'master' into patch-1 2017-04-04 14:51:42 +02:00
Eugen
7f543e1fca Merge pull request #800 from unascribed/patch-1
Add fern.surgeplay.com to the instances list
2017-04-04 14:51:01 +02:00
Eugen
180aab6e2e Merge pull request #799 from Wonderfall/master
update social.targaryen.house info
2017-04-04 14:50:35 +02:00
Eugen
b9c1c5bdd0 Merge pull request #788 from yiskah/patch-5
Add instances from instances.mastodon.xyz
2017-04-04 14:49:48 +02:00
Eugen
4068de0eed Merge pull request #815 from walfie/patch-1
Fix typo in Heroku guide
2017-04-04 14:49:06 +02:00
Leo Wzukw
cb21bf5b40 More consistent typography 2017-04-04 06:58:17 +02:00
walfie
766eabf194 Fix typo in Heroku guide 2017-04-04 00:00:56 -04:00
Eugen Rochko
8eca42b265 Separate background jobs into different queues. ATTENTION: new queue "pull"
must be added to the Sidekiq invokation in your systemd file

The pull queue will handle link crawling, thread resolving, and OStatus
processing. Such tasks are more likely to hang for a longer time (due to
network requests) so it is more sensible to not make the "in-house" tasks
wait for them.
2017-04-04 00:53:20 +02:00
Alice
c2787014e5 Add octodon.social 2017-04-03 23:05:03 +02:00
Aesen
9a4a766ab3 Add fern.surgeplay.com to the instances list
It's hard to tell if this is supposed to be alphabetically sorted or not. I put it after epiktistes since it starts with F - let me know if it should go elsewhere.
2017-04-03 15:52:33 -04:00
Wonderfall
e27807e8e9 update social.targaryen.house info 2017-04-03 21:36:28 +02:00
shel
37863b45a3 Add instances from instances.mastodon.xyz
Updated list with lots of instances that have been added to instances.mastodon.xyz but not this list
2017-04-03 12:28:36 -04:00
wxcafé
5c269d3e0e Adds social.wxcafe.net 2017-04-03 17:32:25 +02:00
Kibigo!
dac1ca1e40 "direct" in statuses#create 2017-04-03 01:23:37 -07:00
Kibigo!
145493fd4c Forgot direct statuses :P 2017-04-02 22:46:10 -07:00
Kibigo!
a9f7e93396 Typofixes 2017-04-02 21:17:07 -07:00
Kibigo!
db554277b9 Code now code 2017-04-02 21:13:15 -07:00
Kibigo!
034f60b5c4 Merging 'upstream' updates 2017-04-02 21:07:07 -07:00
Kibigo!
0b99777853 Updated API docs 2017-04-02 21:03:49 -07:00
Eugen
c385fc5d3c Merge pull request #757 from yiskah/patch-4
Add social.imirhil.fr
2017-04-03 03:40:20 +02:00
Eugen
ebd4650511 Merge pull request #748 from ProgVal/patch-1
Fix install instructions.
2017-04-03 03:39:35 +02:00
shel
fd51b1a2a5 Add social.imirhil.fr 2017-04-02 20:11:28 -04:00
Eugen
97a75cc942 Merge pull request #744 from fpiesche/master
Add in-depth user guide
2017-04-03 00:26:24 +02:00
Valentin Lorentz
02fac04fc5 Also fix the start command. 2017-04-03 00:10:51 +02:00
Valentin Lorentz
e089c66083 Fix install instructions.
Closes GH-745.
2017-04-03 00:08:40 +02:00
Michael Vieira
621b595c46 add link to another mastodon instance. 2017-04-03 00:04:54 +02:00
Florian Piesche
567587b789 Update images to standard sizes. Write up Federated/Local timelines and rename relevant image. 2017-04-02 22:31:43 +01:00
Florian Piesche
9586becc7f Add info on CW tags not automatically hiding images. 2017-04-02 22:07:23 +01:00
Florian Piesche
4404c223a2 Add user guide to README toc 2017-04-02 22:05:21 +01:00
Florian Piesche
9cc9321935 Update to catch up with new features and add missing images. 2017-04-02 22:03:00 +01:00
Florian Piesche
b5be221637 Write up reporting. 2017-04-02 21:45:51 +01:00
Florian Piesche
dfcd9a3a5c Add information about the Direct privacy setting. 2017-04-02 21:39:05 +01:00
Florian Piesche
62d639bb27 Add information on following remote users or using the Search box to find them. 2017-04-02 21:33:39 +01:00
TheKinrar
ef40b260f3 Add link to instances.mastodon.xyz 2017-04-02 17:48:25 +02:00
Sina Mashek
aa72831d14 Adding social.mashek.net 2017-04-02 16:22:13 +03:00
Eugen
5b39827c82 Merge branch 'master' into patch-1 2017-04-02 12:33:29 +02:00
TheKinrar
e7840652bb Add IPv6 column in list and remove dead instance
This is done after some complaints I saw on Twitter about the lack of IPv6 support on Mastodon instances.
Also, seeing this may encourage instances owner to add IPv6 support to their own.
2017-04-02 12:05:32 +02:00
jenn kaplan
9460fa9d10 Updated list of instances for gay.crime.team
Updated out-of-date info for gay.crime.team
2017-04-01 22:37:10 -07:00
Wonderfall
77d3ed5be3 Add social.targaryen.house to instances list 2017-04-01 23:53:00 +02:00
TheKinrar
4bb2888a9d Add mastodon.xyz to instances list 2017-04-01 18:00:52 +02:00
Alex Gleason
f62b7faa17 Put line breaks between API methods in docs 2017-03-31 14:55:08 -04:00
shel
3656972cea Update amaroq name 2017-03-26 15:45:16 -04:00
shel
ee55d5fabb Update Matador name to 11t
The project was renamed 11t, the link goes to a project titled "11t" this is just an update
2017-03-17 11:49:31 -04:00
shel
5c7b222769 Promote Apps (#670)
"Various apps are available" is now a hyperlink
2017-03-17 16:16:39 +01:00
Eugen Rochko
c97f817e40 Fix #525 - Add instance information API 2017-03-15 23:12:48 +01:00
Eugen
6599b27b2b Merge branch 'master' into mastodon-site-api 2017-03-15 22:55:22 +01:00
Eugen
d100a6148e Update list of apps 2017-03-15 18:44:37 +01:00
Eugen Rochko
453d65e6da Obfuscate filenames better, double rate limits 2017-03-14 15:59:21 +01:00
Eugen Rochko
d1e1f26878 Improved /api/v1/accounts/:id/statuses with new params: only_media, exclude_replies
Redirect /:username to /users/:username
Redirect /:username/:id to /users/:username/updates/:id
Updated API documentation and sponsors
2017-03-05 17:27:17 +01:00
Alexander Acevedo
4dc21d0482 add social.gestaltzerfall.net instance information
Hello fediverse!
2017-03-03 19:17:58 -05:00
undrskr
a0f4ebedf6 gnusocial.me doesn't use Mastodon anymore
The host uses postActiv now.
2017-03-03 22:38:10 +02:00
shel
7ed683a1d9 Add social.dickseven.com
New instance
2017-02-28 13:02:39 -05:00
Eugen
cbc4c1c3fa Updated sponsors 2017-02-28 14:58:11 +01:00
Kibigo
b39356835b Adds site metadata access to the API 2017-02-27 04:06:25 -08:00
Eugen Rochko
5157e25aab Add tuning documentation, add <content> tags back to most salmons,
make status pagination headers generation more lax about next page
existing
2017-02-25 03:34:37 +01:00
Florian Piesche
ef9403e744 Add user guide. 2017-02-17 16:14:10 +00:00
Eugen
02332f452c Fix outdated info 2017-02-14 21:33:31 +01:00
Tom McAtee
525d615fd7 Fixed the URL
Heroku uses the referrer URL to point at the repo that should be deployed; from this page that includes part of a path that breaks the deployment (specifically /blob/master/docs/Running-Mastodon/Heroku-guide.md).

I've replaced the vanilla address with one that includes a specific reference to the root of the repo
2017-02-14 12:46:18 +10:30
Eugen
2bdd46cc26 Merge pull request #630 from yiskah/patch-6
Add memetastic.space to instance list
2017-02-13 20:42:40 +01:00
Eugen Rochko
1e94617a09 Add rake task for making someone into an admin 2017-02-13 20:42:02 +01:00
shel
b2ecb316ef Add memetastic.space
It's uh, it's an instance now.
2017-02-13 14:37:58 -05:00
Lorenz Diener
d315966c70 Add https://icosahedron.website/ 2017-02-13 17:25:21 +01:00
Effy Elden
92ca519ac4 Remove toot.zone
toot.zone is being discontinued
2017-02-12 14:51:53 +11:00
Eugen Rochko
db53bfd30e Fix semantics of follow requests another slaps 2017-02-11 17:13:11 +01:00
Eugen Rochko
f05f545a58 Improve docs 2017-02-11 16:21:07 +01:00
shel
e352fb35a5 Add gnusocial.me to instance list
I'm never going to get tired of saying "gnusocial.me is a mastodon instance"
2017-02-10 15:07:44 -05:00
Eugen
caf2b68730 Merge branch 'master' into patch-3 2017-02-10 19:15:13 +01:00
shel
c4036234a1 Clean up markdown
There were some markdown processing errors which I've cleaned up
2017-02-10 12:14:49 -05:00
shel
98f3eb884c Change List of Instances to Table
Change list of known instances to a table with additional information per instance. Add awoo.space and gay.crime.team
2017-02-10 11:37:35 -05:00
Neville Park
573a0d9149 Added awoo.space 2017-02-09 17:57:56 -05:00
Eugen Rochko
78552ab850 Add postgres setup instructions to docs 2017-02-07 23:57:30 +01:00
Eugen Rochko
2f126b1225 Removing failed push notification API, make context loads use cache 2017-02-05 17:51:44 +01:00
Eugen Rochko
9bd2b6be86 Make the streaming API also handle websockets (because trying to get the browser EventSource interface to
work flawlessly was a nightmare). WARNING: This commit makes the web UI connect to the streaming API instead
of ActionCable like before. This means that if you are upgrading, you should set that up beforehand.
2017-02-04 00:34:31 +01:00
James
702623b347 fix extraneous text in 2fa readme (#592) 2017-02-03 00:10:22 +01:00
Eugen
0a19f0b2c8 Add tootyfruity 2017-02-02 20:27:53 +01:00
Eugen
d693e338b8 Update Sponsors.md 2017-02-02 20:14:02 +01:00
Eugen
11496d174a Update Sponsors.md 2017-02-02 19:43:21 +01:00
Eugen
603c00684d Updated list of top sponsors 2017-02-02 19:40:15 +01:00
Eugen Rochko
b860cbcbdf Adding documentation for streaming API. Fixing filtering bug 2017-02-02 16:35:06 +01:00
Eugen Rochko
727d236fcc Cleaning up format of broadcast real-time messages, removing
redis-backed "mentions" timeline as redundant (given notifications)
2017-02-02 00:03:31 +01:00
James
32ff6edba1 Add 2-FA instructions for non-technical users (#580) 2017-01-29 19:26:27 +01:00
Eugen
e05d1b9b7c Update some API docs 2017-01-29 14:40:57 +01:00
Eugen Rochko
e04c691737 Add more links to main docs page 2017-01-29 12:59:02 +01:00
Eugen Rochko
0cbb2535e4 Fix JSON formatting in docs 2017-01-29 12:55:12 +01:00
Eugen Rochko
e149b2b779 Update docs with information about push notifications 2017-01-29 12:53:50 +01:00
Eugen Rochko
043cc6a741 Update broken links, add new sponsor 2017-01-27 17:01:21 +01:00
nicolas
597f547352 Updated translation doc to get working links 2017-01-27 13:17:33 +01:00
Eugen
380ddcdebf Merge pull request #549 from ineffyble/docs/add-default-account-to-dev-documentation
Add default account details to developer documentation.
2017-01-26 23:03:41 +01:00
Christian Walde
43075a246e document that /oauth/token does not always return json 2017-01-26 16:28:57 +01:00
Effy Elden
0a909f2e6b Add default account details to developer documentation. 2017-01-27 02:03:13 +11:00
Christian Walde
fbfaf0663f clarify the intended use of the oauth api call as per this issue:
https://github.com/alin-rautoiu/mastodroid/issues/23
2017-01-25 18:31:15 +01:00
Eugen Rochko
4d011ee829 Use <summary> to encode content warnings instead 2017-01-25 16:53:30 +01:00
Eugen Rochko
2627571ba4 Add content warning example to docs 2017-01-25 02:54:28 +01:00
Eugen Rochko
92b8fc56a8 Add description of Mastodon's current protocol extensions 2017-01-25 02:46:16 +01:00
Effy Elden
65748b7623 Add separate sections for Heroku and Vagrant deployments. Add guide for instance administration. Move 'Contribution guide' to 'Development guide'. 2017-01-22 19:50:40 +11:00
Eugen Rochko
446cce198b Rename main docs page so it renders in github 2017-01-21 22:54:49 +01:00
Eugen Rochko
7769fb6a5a Improve API docs formatting 2017-01-21 22:53:02 +01:00
Eugen Rochko
954f82410c Add wiki contents to docs/ instead 2017-01-21 22:51:02 +01:00