hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,952 Commits
7 Branches
0 Tags
179 MiB
Commit Graph

272 Commits (f59ed3a4fafab776b4eeb92f805dfe1fecc17ee3)

Author SHA1 Message Date
Eugen 78c1e2e958 Merge branch 'master' into patch-1 2017-04-05 03:19:14 +02:00
Eugen bdaf31bcc9 Merge branch 'master' into patch-1 2017-04-05 03:18:42 +02:00
Eugen f735efdbc1 Merge pull request #846 from TrollDecker/master 
Update social.diskseven.com's IPv6 status
 2017-04-05 03:08:59 +02:00
Eugen 1709dee0f1 Merge pull request #842 from Angristan/patch-2 
Missing quotes
 2017-04-05 03:08:24 +02:00
Eugen 1c634ad21a Merge pull request #845 from thurloat/patch-1 
Add mastodon.club to running instances list
 2017-04-05 03:07:59 +02:00
Eugen 682c8a6fc8 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 66ec005bf8 Merge pull request #854 from Angristan/patch-3 
Fix crontab edit
 2017-04-05 03:07:28 +02:00
Eugen d3dab68978 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 417273326a Merge pull request #894 from asm/mastodon_cc 
Adding https://mastodon.cc
 2017-04-05 02:56:54 +02:00
Ash Furrow dd441606aa Updates instructions. 2017-04-04 20:53:31 -04:00
Eugen feea517046 Merge pull request #872 from kwaio/patch-1 
typo in admin doc
 2017-04-05 02:53:09 +02:00
Jason Snell 50a88d6a6e Adding https://mastodon.cc 2017-04-04 16:35:57 -07:00
Ash Furrow 04225ed72e Adds instructions for adding admin users. 2017-04-04 18:45:24 -04:00
Udo Kramer 1e5a1b9abd Update Production-guide.md 2017-04-04 23:45:29 +02:00
Nope Nope dcda852b5f typo in admin doc 
s/rails/rake/
 2017-04-04 20:45:32 +02:00
Angristan 6091b9b1a9 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 41ba74b511 Update the list of instances 2017-04-04 17:28:29 +01:00
Valentin Lorentz 22000ef7a9 Add oc.todon.fr to the list of instances. 
[SKIP CI]
 2017-04-04 18:11:41 +02:00
Sébastien Santoro 7015578655 Add social.nasqueron.org instance 2017-04-04 18:11:14 +02:00
Angristan 2fcf8d79ad Fix crontab edit 
Missing -u parameter to specify the mastodon user.
 2017-04-04 17:23:56 +02:00
Jo Decker d8855150a0 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 192f079776 Add mastodon.club to running instances list 2017-04-04 11:14:51 -03:00
Florian Maunier 58bdb9b42e Update List-of-Mastodon-instances.md 
Add my own instance
 2017-04-04 16:03:05 +02:00
Angristan 665ec615e3 Missing quotes 2017-04-04 15:57:37 +02:00
Eugen 48dfdad492 Merge branch 'master' into patch-1 2017-04-04 14:51:42 +02:00
Eugen ed4a723a82 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 c359e60034 Merge pull request #799 from Wonderfall/master 
update social.targaryen.house info
 2017-04-04 14:50:35 +02:00
Eugen 7c075b5551 Merge pull request #788 from yiskah/patch-5 
Add instances from instances.mastodon.xyz
 2017-04-04 14:49:48 +02:00
Eugen 1e81cad3f3 Merge pull request #815 from walfie/patch-1 
Fix typo in Heroku guide
 2017-04-04 14:49:06 +02:00
Leo Wzukw e81ba26be9 More consistent typography 2017-04-04 06:58:17 +02:00
walfie c22388fc79 Fix typo in Heroku guide 2017-04-04 00:00:56 -04:00
Eugen Rochko f722bd2387 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 5b6f4fdeb4 Add octodon.social 2017-04-03 23:05:03 +02:00
Aesen 1ed37fae9b 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 cc451e1fcb update social.targaryen.house info 2017-04-03 21:36:28 +02:00
shel 8a45a97e2e 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é d06c810b16 Adds social.wxcafe.net 2017-04-03 17:32:25 +02:00
Kibigo! b455cbc6d3 "direct" in statuses#create 2017-04-03 01:23:37 -07:00
Kibigo! a9db64cf26 Forgot `direct` statuses :P 2017-04-02 22:46:10 -07:00
Kibigo! 5d2f1d600d Typofixes 2017-04-02 21:17:07 -07:00
Kibigo! 5d65aa3bf9 Code now code 2017-04-02 21:13:15 -07:00
Kibigo! 565568dd9c Merging 'upstream' updates 2017-04-02 21:07:07 -07:00
Kibigo! 6e41ef55ed Updated API docs 2017-04-02 21:03:49 -07:00
Eugen 3f650c06b6 Merge pull request #757 from yiskah/patch-4 
Add social.imirhil.fr
 2017-04-03 03:40:20 +02:00
Eugen 6b9c50117f Merge pull request #748 from ProgVal/patch-1 
Fix install instructions.
 2017-04-03 03:39:35 +02:00
shel e2526a62e7 Add social.imirhil.fr 2017-04-02 20:11:28 -04:00
Eugen d7d60073f9 Merge pull request #744 from fpiesche/master 
Add in-depth user guide
 2017-04-03 00:26:24 +02:00
Valentin Lorentz 9ca548c17e Also fix the start command. 2017-04-03 00:10:51 +02:00
Valentin Lorentz 82ae07e48b Fix install instructions. 
Closes GH-745.
 2017-04-03 00:08:40 +02:00
Michael Vieira b69e97c40b add link to another mastodon instance. 2017-04-03 00:04:54 +02:00
Florian Piesche 590558d52c Update images to standard sizes. Write up Federated/Local timelines and rename relevant image. 2017-04-02 22:31:43 +01:00
Florian Piesche e92796b49c Add info on CW tags not automatically hiding images. 2017-04-02 22:07:23 +01:00
Florian Piesche a729d0c2b1 Add user guide to README toc 2017-04-02 22:05:21 +01:00
Florian Piesche 60a82c9022 Update to catch up with new features and add missing images. 2017-04-02 22:03:00 +01:00
Florian Piesche b277e88aae Write up reporting. 2017-04-02 21:45:51 +01:00
Florian Piesche 03b2f37b46 Add information about the Direct privacy setting. 2017-04-02 21:39:05 +01:00
Florian Piesche 0f274589dd Add information on following remote users or using the Search box to find them. 2017-04-02 21:33:39 +01:00
TheKinrar 9f219d8968 Add link to instances.mastodon.xyz 2017-04-02 17:48:25 +02:00
Sina Mashek aaea7e1e7c Adding social.mashek.net 2017-04-02 16:22:13 +03:00
Eugen a2fa09518f Merge branch 'master' into patch-1 2017-04-02 12:33:29 +02:00
TheKinrar f5d434e433 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 1389d5d7fd 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 7ccc9b8b02
Add social.targaryen.house to instances list 2017-04-01 23:53:00 +02:00
TheKinrar 355168b939 Add mastodon.xyz to instances list 2017-04-01 18:00:52 +02:00
Alex Gleason d835647ec0 Put line breaks between API methods in docs 2017-03-31 14:55:08 -04:00
shel 5181702a60 Update amaroq name 2017-03-26 15:45:16 -04:00
shel dd64baeba2 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 38dceb3bf7 Promote Apps (#670) 
"Various apps are available" is now a hyperlink
 2017-03-17 16:16:39 +01:00
Eugen Rochko 6be7bde243 Fix #525 - Add instance information API 2017-03-15 23:12:48 +01:00
Eugen e245115f47 Merge branch 'master' into mastodon-site-api 2017-03-15 22:55:22 +01:00
Eugen c1124228e8 Update list of apps 2017-03-15 18:44:37 +01:00
Eugen Rochko 02349b3269 Obfuscate filenames better, double rate limits 2017-03-14 15:59:21 +01:00
Eugen Rochko 5f4e402204 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 851b730373 add social.gestaltzerfall.net instance information 
Hello fediverse!
 2017-03-03 19:17:58 -05:00
undrskr fac8bfc03f gnusocial.me doesn't use Mastodon anymore 
The host uses postActiv now.
 2017-03-03 22:38:10 +02:00
shel b4a12c88e7 Add social.dickseven.com 
New instance
 2017-02-28 13:02:39 -05:00
Eugen 0327ab9616 Updated sponsors 2017-02-28 14:58:11 +01:00
Kibigo 620f70e42c Adds site metadata access to the API 2017-02-27 04:06:25 -08:00
Eugen Rochko 3e9d794ea5 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 dad204a54d Add user guide. 2017-02-17 16:14:10 +00:00
Eugen e571a01853 Fix outdated info 2017-02-14 21:33:31 +01:00
Tom McAtee 68dba5f2eb 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 bae7cf8cce Merge pull request #630 from yiskah/patch-6 
Add memetastic.space to instance list
 2017-02-13 20:42:40 +01:00
Eugen Rochko fae1799646 Add rake task for making someone into an admin 2017-02-13 20:42:02 +01:00
shel 7a99699e2d Add memetastic.space 
It's uh, it's an instance now.
 2017-02-13 14:37:58 -05:00
Lorenz Diener 73210a93df Add https://icosahedron.website/ 2017-02-13 17:25:21 +01:00
Effy Elden 0eee63f074 Remove toot.zone 
toot.zone is being discontinued
 2017-02-12 14:51:53 +11:00
Eugen Rochko 50660d54e8 Fix semantics of follow requests another slaps 2017-02-11 17:13:11 +01:00
Eugen Rochko 0b95eb3612 Improve docs 2017-02-11 16:21:07 +01:00
shel 894a0515d9 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 874fffb7dc Merge branch 'master' into patch-3 2017-02-10 19:15:13 +01:00
shel a0e6c80b60 Clean up markdown 
There were some markdown processing errors which I've cleaned up
 2017-02-10 12:14:49 -05:00
shel 63a18efb27 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 e9fa557ead Added awoo.space 2017-02-09 17:57:56 -05:00
Eugen Rochko aa1213e089 Add postgres setup instructions to docs 2017-02-07 23:57:30 +01:00
Eugen Rochko 77e13c2bc9 Removing failed push notification API, make context loads use cache 2017-02-05 17:51:44 +01:00
Eugen Rochko ccb8ac8573 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 7b7a356aed fix extraneous text in 2fa readme (#592) 2017-02-03 00:10:22 +01:00
Eugen 9cf7da4934 Add tootyfruity 2017-02-02 20:27:53 +01:00
Eugen 9faf4c9dea Update Sponsors.md 2017-02-02 20:14:02 +01:00
Eugen 1511efc8d2 Update Sponsors.md 2017-02-02 19:43:21 +01:00
Eugen d33dfce34f Updated list of top sponsors 2017-02-02 19:40:15 +01:00
Eugen Rochko aa2fa227e9 Adding documentation for streaming API. Fixing filtering bug 2017-02-02 16:35:06 +01:00
Eugen Rochko d9ca46b464 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 b12bdd2aea Add 2-FA instructions for non-technical users (#580) 2017-01-29 19:26:27 +01:00
Eugen 2165a0ec63 Update some API docs 2017-01-29 14:40:57 +01:00
Eugen Rochko aa52d5fd1e Add more links to main docs page 2017-01-29 12:59:02 +01:00
Eugen Rochko ca8a9d5941 Fix JSON formatting in docs 2017-01-29 12:55:12 +01:00
Eugen Rochko fe9306f346 Update docs with information about push notifications 2017-01-29 12:53:50 +01:00
Eugen Rochko dc3e0529ca Update broken links, add new sponsor 2017-01-27 17:01:21 +01:00
nicolas 9f57c7d4a6 Updated translation doc to get working links 2017-01-27 13:17:33 +01:00
Eugen 87667e371c 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 12eddb5cbe document that /oauth/token does not always return json 2017-01-26 16:28:57 +01:00
Effy Elden ae2147d40f Add default account details to developer documentation. 2017-01-27 02:03:13 +11:00
Christian Walde 3b6af5245b 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 3beb24ad55 Use <summary> to encode content warnings instead 2017-01-25 16:53:30 +01:00
Eugen Rochko ca04002c93 Add content warning example to docs 2017-01-25 02:54:28 +01:00
Eugen Rochko ab94ad3504 Add description of Mastodon's current protocol extensions 2017-01-25 02:46:16 +01:00
Effy Elden 92a98f73aa 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 536cde4e99 Rename main docs page so it renders in github 2017-01-21 22:54:49 +01:00
Eugen Rochko 2baf0fabb4 Improve API docs formatting 2017-01-21 22:53:02 +01:00
Eugen Rochko e92a1cf436 Add wiki contents to docs/ instead 2017-01-21 22:51:02 +01:00