kikobar/mastodon
1
0
Fork 0
mirror of https://github.com/kikobar/mastodon.git synced 2024-11-15 03:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
12794 commits 3 branches 256 tags 283 MiB
Commit graph

12794 commits

This branch
This branch
All branches
Author SHA1 Message Date
Shel R 698d74a15f Merge pull request #1030 from derekcecillewis/add-infinimatix.net-instance 
Add infinimatix.net to instance list
 2017-04-07 22:34:10 -04:00
Shel R d7d165db5b Merge branch 'master' into add-infinimatix.net-instance 2017-04-07 22:33:40 -04:00
Shel R d7f4300ee3 Merge pull request #1009 from ngerakines/patch-1 
Added off-the-clock.us to the list of instances
 2017-04-07 22:25:45 -04:00
Shel R 7632178300 Merge branch 'master' into patch-1 2017-04-07 22:23:50 -04:00
Shel R e4e948a21b Merge pull request #797 from AndreLewin/master 
Added Esperanto translation (eo)
 2017-04-07 22:21:48 -04:00
Shel R fef478781d Merge branch 'master' into master 2017-04-07 22:21:21 -04:00
Shel R c1a553d2c2 Merge pull request #1006 from Ninetailed/master 
Description in instance list for mastodon.ninetailed.uk
 2017-04-07 22:18:11 -04:00
Shel R 3e8c1a1c36 Merge branch 'master' into master 2017-04-07 22:17:53 -04:00
Shel R 9fd8bbe15c Merge pull request #992 from Eychics/master 
Add mastodon.nuzgo.net in instance list
 2017-04-07 22:16:49 -04:00
Shel R 1b42f717f2 Merge branch 'master' into master 2017-04-07 22:15:55 -04:00
Shel R 7004c69204 Merge pull request #991 from vladooku/patch-1 
Update List-of-Mastodon-instances.md
 2017-04-07 22:15:12 -04:00
Shel R 9981972844 Merge branch 'master' into patch-1 2017-04-07 22:14:08 -04:00
Shel R 5f61ef2417 Merge pull request #989 from MTNDevelopment/master 
Updates instance list
 2017-04-07 22:13:34 -04:00
Shel R cf13c97cb2 Merge branch 'master' into master 2017-04-07 22:13:06 -04:00
Shel R 90a408f592 Merge pull request #986 from estuans/patch-2 
Update List-of-Mastodon-instances.md
 2017-04-07 22:11:55 -04:00
Shel R 451b7431c9 Merge branch 'master' into patch-2 2017-04-07 22:11:24 -04:00
Shel R 530725ba3c Merge pull request #985 from Motoma/patch-1 
Add Rich.GOP
 2017-04-07 22:10:22 -04:00
Shel R 6efaee30b1 Merge branch 'master' into patch-1 2017-04-07 22:09:55 -04:00
Shel R 698fe3686a Merge pull request #982 from foxiehkins/master 
Adding good-dragon.com instance to list
 2017-04-07 22:09:15 -04:00
Shel R 05be34a94b Merge branch 'master' into master 2017-04-07 22:08:54 -04:00
Shel R cb58694a81 Merge pull request #976 from shug0/patch-1 
Adding masto.raildecake.fr, french instance 🌻🐘
 2017-04-07 22:06:06 -04:00
Shel R e51b6bba94 Merge branch 'master' into patch-1 2017-04-07 22:05:38 -04:00
Shel R 7f393a0b68 Merge pull request #975 from tomfhowe/patch-4 
Use autohiding scrollbars in Microsoft Edge
 2017-04-07 22:03:35 -04:00
Shel R 9f43e3b428 Merge branch 'master' into patch-4 2017-04-07 22:02:26 -04:00
Shel R 4a40b40324 Merge pull request #973 from ZiiX/patch-1 
added instance
 2017-04-07 21:59:51 -04:00
Shel R 4c05f0e630 Merge branch 'master' into patch-1 2017-04-07 21:59:21 -04:00
Shel R d438eab673 Merge pull request #972 from amandavisconti/master 
Added digitalhumanities.club instance
 2017-04-07 21:56:57 -04:00
Shel R 7b7bff04df Merge branch 'master' into master 2017-04-07 21:54:32 -04:00
Shel R e659608797 Merge pull request #970 from estuans/patch-1 
Update Production-guide.md
 2017-04-07 21:49:57 -04:00
Shel R ed332693fe Merge branch 'master' into patch-1 2017-04-07 21:49:18 -04:00
Shel R 881e4277fd Merge pull request #969 from Fortyseven/patch-1 
Add social.bytestemplar.com to instances list
 2017-04-07 21:48:58 -04:00
Shel R 5dfc9854f1 Merge branch 'master' into patch-1 2017-04-07 21:48:19 -04:00
Shel R b300bb3b4e Merge pull request #959 from mkody/patch-1 
Added im-in.space
 2017-04-07 21:45:06 -04:00
Shel R 6d519e6fd1 Merge branch 'master' into patch-1 2017-04-07 21:44:16 -04:00
Shel R d2c9cc31de Merge pull request #953 from Technowix/patch-1 
Add niu.moe, cuz it's kawaii
 2017-04-07 21:43:20 -04:00
Shel R 065defefac Merge branch 'master' into patch-1 2017-04-07 21:42:10 -04:00
Shel R 6bfe068904 Merge pull request #944 from VirtuBox/patch-1 
Update List-of-Mastodon-instances.md
 2017-04-07 21:35:34 -04:00
Shel R bc237d17a7 Merge branch 'master' into patch-1 2017-04-07 21:34:41 -04:00
Yann GUERN 485d75a805 #1141 on remote follow 
The async action is send before persist, account.id not yet generated

Pull queue receive 'nil' so no profile update.
 2017-04-08 03:24:35 +02:00
Eugen Rochko 4b621188ad Fix #1165 - before_action was called before protect_from_forgery 2017-04-08 02:30:50 +02:00
David Huerta 4fb24a70d3 Merge branch 'master' into patch-1 2017-04-07 19:46:07 -04:00
Eugen Rochko b2a7218ab7 Fix #801 - Respect webfinger's canonical response of username/domain 2017-04-08 01:07:42 +02:00
Eugen a872f2f4c6 Merge pull request #1204 from benklop/patch-1 
Update Administration-guide.md
 2017-04-08 01:00:32 +02:00
Eugen 32a6f0884c Merge pull request #1200 from huertanix/patch-2 
Update Heroku-guide.md
 2017-04-08 01:00:06 +02:00
Eugen a54af44975 Merge pull request #1210 from raymestalez/patch-3 
Add HackerNewsBot
 2017-04-08 00:59:02 +02:00
Ray Alez f113af5350 Add HackerNewsBot 
I have created a bot that will post Hacker News stories with 100+ points. Adding it to the list.
 2017-04-07 15:56:02 -07:00
benklop f578cf8331 Update Administration-guide.md 
the syntax for running the rake task wasn't correct.
 2017-04-07 16:31:50 -06:00
Eugen 3cb13bdd84 Merge pull request #1125 from jasonrhodes/patch-1 
Email service options :P
 2017-04-08 00:24:38 +02:00
Eugen 0bf31f5436 Merge pull request #1147 from fmauNeko/docker_smaller_image 
Fix npm/yarn cache cleaning
 2017-04-07 23:45:48 +02:00
David Huerta a7ab2204d4 Update Heroku-guide.md 
Cleaning up the heroku admin command bit to match the form used in Administration-guide.md and clarify the wording a bit.
 2017-04-07 17:44:32 -04:00