Commit Graph

101 Commits (6a8bb89f80f592f6b34693281cc462488414b90c)

Author SHA1 Message Date
Eugen a5f1a6bf01 Merge pull request #872 from kwaio/patch-1
typo in admin doc
2017-04-05 02:53:09 +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
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