specter/mastodon
1
0
Fork 0
forked from fedi/mastodon
Code Pull requests Activity
8652 commits 82 branches 202 tags 316 MiB
Commit graph

8652 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Valentin Ouvrard 5b571fc434 Merge branch 'master' into master 2017-04-08 13:39:31 +11:00
Valentin Ouvrard 3e4eb9c95f Merge branch 'master' into master 2017-04-08 13:39:09 +11:00
Shel R ceba26d527 Merge pull request #1041 from R0ckweb/patch-1 
Update List-of-Mastodon-instances.md
 2017-04-07 22:39:05 -04:00
Shel R 7826b5e93d Merge branch 'master' into patch-1 2017-04-07 22:38:37 -04:00
Shel R fc7b830719 Merge pull request #1036 from wirehack7/patch-1 
Update List-of-Mastodon-instances.md
 2017-04-07 22:37:51 -04:00
Shel R c945f29e96 Merge branch 'master' into patch-1 2017-04-07 22:35:45 -04:00
Shel R 0d4d42dce6 Merge pull request #1035 from gfaivre/add-elao-com-instance 
Add mastodon.elao.com instance
 2017-04-07 22:35:08 -04:00
Shel R cf03634e74 Merge branch 'master' into add-elao-com-instance 2017-04-07 22:34:45 -04:00
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