Commit graph

116 commits

Author SHA1 Message Date
Eugen
dc9a9e7366 Merge pull request #846 from TrollDecker/master
Update social.diskseven.com's IPv6 status
2017-04-05 03:08:59 +02:00
Eugen
48589d1ec3 Merge pull request #842 from Angristan/patch-2
Missing quotes
2017-04-05 03:08:24 +02:00
Eugen
d30df21d88 Merge pull request #845 from thurloat/patch-1
Add mastodon.club to running instances list
2017-04-05 03:07:59 +02:00
Eugen
e30f10a09b 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
865427092d Merge pull request #854 from Angristan/patch-3
Fix crontab edit
2017-04-05 03:07:28 +02:00
Eugen
af710eb5eb 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
bd3cce5ed9 Merge pull request #894 from asm/mastodon_cc
Adding https://mastodon.cc
2017-04-05 02:56:54 +02:00
Ash Furrow
0a8023314b Updates instructions. 2017-04-04 20:53:31 -04:00
Eugen
d7b9a8c1e1 Merge pull request #872 from kwaio/patch-1
typo in admin doc
2017-04-05 02:53:09 +02:00
Jason Snell
7e300a5e57 Adding https://mastodon.cc 2017-04-04 16:35:57 -07:00
Ash Furrow
eada9ae113 Adds instructions for adding admin users. 2017-04-04 18:45:24 -04:00
Nope Nope
72319ecf7b typo in admin doc
s/rails/rake/
2017-04-04 20:45:32 +02:00
Angristan
080caa0dff 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
Valentin Lorentz
cfb9551aca Add oc.todon.fr to the list of instances.
[SKIP CI]
2017-04-04 18:11:41 +02:00
Angristan
c4afe950bb Fix crontab edit
Missing -u parameter to specify the mastodon user.
2017-04-04 17:23:56 +02:00
Jo Decker
36cd3cc4dd 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
e3327c69f1 Add mastodon.club to running instances list 2017-04-04 11:14:51 -03:00
Angristan
5714143e53 Missing quotes 2017-04-04 15:57:37 +02:00
Eugen
97d59985f9 Merge branch 'master' into patch-1 2017-04-04 14:51:42 +02:00
Eugen
08eecf0959 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
d73661496a Merge pull request #799 from Wonderfall/master
update social.targaryen.house info
2017-04-04 14:50:35 +02:00
Eugen
0cf9af385e Merge pull request #788 from yiskah/patch-5
Add instances from instances.mastodon.xyz
2017-04-04 14:49:48 +02:00
Eugen
e5e03e5551 Merge pull request #815 from walfie/patch-1
Fix typo in Heroku guide
2017-04-04 14:49:06 +02:00
Leo Wzukw
08c4451549 More consistent typography 2017-04-04 06:58:17 +02:00
walfie
eef381b5c6 Fix typo in Heroku guide 2017-04-04 00:00:56 -04:00
Eugen Rochko
5e91a1dfbd 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
243f910f40 Add octodon.social 2017-04-03 23:05:03 +02:00
Aesen
de75d8eb14 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
4d434a17ec update social.targaryen.house info 2017-04-03 21:36:28 +02:00
shel
348556e9bb 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é
28794ac290 Adds social.wxcafe.net 2017-04-03 17:32:25 +02:00
Kibigo!
569b6494b7 "direct" in statuses#create 2017-04-03 01:23:37 -07:00
Kibigo!
33673b0ee0 Forgot direct statuses :P 2017-04-02 22:46:10 -07:00
Kibigo!
95993397fe Typofixes 2017-04-02 21:17:07 -07:00
Kibigo!
98d2f84675 Code now code 2017-04-02 21:13:15 -07:00
Kibigo!
e22dea2812 Merging 'upstream' updates 2017-04-02 21:07:07 -07:00
Kibigo!
81c56f111a Updated API docs 2017-04-02 21:03:49 -07:00
Eugen
ca343d2583 Merge pull request #757 from yiskah/patch-4
Add social.imirhil.fr
2017-04-03 03:40:20 +02:00
Eugen
051a39cf99 Merge pull request #748 from ProgVal/patch-1
Fix install instructions.
2017-04-03 03:39:35 +02:00
shel
caf5b4df1a Add social.imirhil.fr 2017-04-02 20:11:28 -04:00
Eugen
986c23eb83 Merge pull request #744 from fpiesche/master
Add in-depth user guide
2017-04-03 00:26:24 +02:00
Valentin Lorentz
973a74d252 Also fix the start command. 2017-04-03 00:10:51 +02:00
Valentin Lorentz
8b5966b37b Fix install instructions.
Closes GH-745.
2017-04-03 00:08:40 +02:00
Michael Vieira
7b70f24da3 add link to another mastodon instance. 2017-04-03 00:04:54 +02:00
Florian Piesche
9611dc1bb0 Update images to standard sizes. Write up Federated/Local timelines and rename relevant image. 2017-04-02 22:31:43 +01:00
Florian Piesche
ebaba85e07 Add info on CW tags not automatically hiding images. 2017-04-02 22:07:23 +01:00
Florian Piesche
d5ede4007d Add user guide to README toc 2017-04-02 22:05:21 +01:00
Florian Piesche
07613f1237 Update to catch up with new features and add missing images. 2017-04-02 22:03:00 +01:00
Florian Piesche
db322a525c Write up reporting. 2017-04-02 21:45:51 +01:00
Florian Piesche
7faf421134 Add information about the Direct privacy setting. 2017-04-02 21:39:05 +01:00