tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,439 Commits 10 Branches 0 Tags
efacfec3ed37c200bf5bad05b59e04a9f97d0d08
Commit Graph
272 Commits
Author SHA1 Message Date
EugenandGitHub 78c1e2e958 Merge branch 'master' into patch-1 2017-04-05 03:19:14 +02:00
EugenandGitHub bdaf31bcc9 Merge branch 'master' into patch-1 2017-04-05 03:18:42 +02:00
EugenandGitHub f735efdbc1 Merge pull request #846 from TrollDecker/master 
Update social.diskseven.com's IPv6 status
 2017-04-05 03:08:59 +02:00
EugenandGitHub 1709dee0f1 Merge pull request #842 from Angristan/patch-2 
Missing quotes
 2017-04-05 03:08:24 +02:00
EugenandGitHub 1c634ad21a Merge pull request #845 from thurloat/patch-1 
Add mastodon.club to running instances list
 2017-04-05 03:07:59 +02:00
EugenandGitHub 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
EugenandGitHub 66ec005bf8 Merge pull request #854 from Angristan/patch-3 
Fix crontab edit
 2017-04-05 03:07:28 +02:00
EugenandGitHub 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
EugenandGitHub 417273326a Merge pull request #894 from asm/mastodon_cc 
Adding https://mastodon.cc
 2017-04-05 02:56:54 +02:00
Ash FurrowandGitHub dd441606aa Updates instructions. 2017-04-04 20:53:31 -04:00
EugenandGitHub 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 FurrowandGitHub 04225ed72e Adds instructions for adding admin users. 2017-04-04 18:45:24 -04:00
Udo KramerandGitHub 1e5a1b9abd Update Production-guide.md 2017-04-04 23:45:29 +02:00
Nope NopeandGitHub dcda852b5f typo in admin doc 
s/rails/rake/
 2017-04-04 20:45:32 +02:00
AngristanandGitHub 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 OzouxandGitHub 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 SantoroandGitHub 7015578655 Add social.nasqueron.org instance 2017-04-04 18:11:14 +02:00
AngristanandGitHub 2fcf8d79ad Fix crontab edit 
Missing -u parameter to specify the mastodon user.
 2017-04-04 17:23:56 +02:00
Jo DeckerandGitHub 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 ThurlowandGitHub 192f079776 Add mastodon.club to running instances list 2017-04-04 11:14:51 -03:00
Florian MaunierandGitHub 58bdb9b42e Update List-of-Mastodon-instances.md 
Add my own instance
 2017-04-04 16:03:05 +02:00
AngristanandGitHub 665ec615e3 Missing quotes 2017-04-04 15:57:37 +02:00
EugenandGitHub 48dfdad492 Merge branch 'master' into patch-1 2017-04-04 14:51:42 +02:00
EugenandGitHub 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
EugenandGitHub c359e60034 Merge pull request #799 from Wonderfall/master 
update social.targaryen.house info
 2017-04-04 14:50:35 +02:00
EugenandGitHub 7c075b5551 Merge pull request #788 from yiskah/patch-5 
Add instances from instances.mastodon.xyz
 2017-04-04 14:49:48 +02:00
EugenandGitHub 1e81cad3f3 Merge pull request #815 from walfie/patch-1 
Fix typo in Heroku guide
 2017-04-04 14:49:06 +02:00
Leo WzukwandGitHub e81ba26be9 More consistent typography 2017-04-04 06:58:17 +02:00
walfieandGitHub 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
AliceandGitHub 5b6f4fdeb4 Add octodon.social 2017-04-03 23:05:03 +02:00
AesenandGitHub 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
WonderfallandGitHub cc451e1fcb update social.targaryen.house info 2017-04-03 21:36:28 +02:00
shelandGitHub 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éandGitHub 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
EugenandGitHub 3f650c06b6 Merge pull request #757 from yiskah/patch-4 
Add social.imirhil.fr
 2017-04-03 03:40:20 +02:00
EugenandGitHub 6b9c50117f Merge pull request #748 from ProgVal/patch-1 
Fix install instructions.
 2017-04-03 03:39:35 +02:00
shelandGitHub e2526a62e7 Add social.imirhil.fr 2017-04-02 20:11:28 -04:00
EugenandGitHub d7d60073f9 Merge pull request #744 from fpiesche/master 
Add in-depth user guide
 2017-04-03 00:26:24 +02:00
Valentin LorentzandGitHub 9ca548c17e Also fix the start command. 2017-04-03 00:10:51 +02:00
Valentin LorentzandGitHub 82ae07e48b Fix install instructions. 
Closes GH-745.
 2017-04-03 00:08:40 +02:00
Michael VieiraandGitHub b69e97c40b add link to another mastodon instance. 2017-04-03 00:04:54 +02:00