Commit graph

2104 commits

Author SHA1 Message Date
Shel R
5669cc4ab9 Merge pull request #1046 from raymestalez/patch-2
Added an instance to the list
2017-04-07 22:40:29 -04:00
Shel R
9539c90339 Merge branch 'master' into patch-2 2017-04-07 22:39:59 -04:00
Valentin Ouvrard
e88edb4ef4 Merge branch 'master' into master 2017-04-08 13:39:31 +11:00
Valentin Ouvrard
a5eb515d0e Merge branch 'master' into master 2017-04-08 13:39:09 +11:00
Shel R
80ea1c927b Merge pull request #1041 from R0ckweb/patch-1
Update List-of-Mastodon-instances.md
2017-04-07 22:39:05 -04:00
Shel R
c249d9091b Merge branch 'master' into patch-1 2017-04-07 22:38:37 -04:00
Shel R
0de53c268e Merge pull request #1036 from wirehack7/patch-1
Update List-of-Mastodon-instances.md
2017-04-07 22:37:51 -04:00
Shel R
ef6b1aac3a Merge branch 'master' into patch-1 2017-04-07 22:35:45 -04:00
Shel R
af02261359 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
ae7f3d9203 Merge branch 'master' into add-elao-com-instance 2017-04-07 22:34:45 -04:00
Shel R
19b4750a47 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
bc5fb211ca Merge branch 'master' into add-infinimatix.net-instance 2017-04-07 22:33:40 -04:00
Shel R
03cda34cde 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
780c512ff5 Merge branch 'master' into patch-1 2017-04-07 22:23:50 -04:00
Shel R
3e8ca58f4c Merge pull request #797 from AndreLewin/master
Added Esperanto translation (eo)
2017-04-07 22:21:48 -04:00
Shel R
3b9a56d4b3 Merge branch 'master' into master 2017-04-07 22:21:21 -04:00
Shel R
a9624f7e11 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
76c073d4fd Merge branch 'master' into master 2017-04-07 22:17:53 -04:00
Shel R
762a6592d6 Merge pull request #992 from Eychics/master
Add mastodon.nuzgo.net in instance list
2017-04-07 22:16:49 -04:00
Shel R
71077a7605 Merge branch 'master' into master 2017-04-07 22:15:55 -04:00
Shel R
a49e89df02 Merge pull request #991 from vladooku/patch-1
Update List-of-Mastodon-instances.md
2017-04-07 22:15:12 -04:00
Shel R
0b90a13f45 Merge branch 'master' into patch-1 2017-04-07 22:14:08 -04:00
Shel R
83ba97da9d Merge pull request #989 from MTNDevelopment/master
Updates instance list
2017-04-07 22:13:34 -04:00
Shel R
81b63dc586 Merge branch 'master' into master 2017-04-07 22:13:06 -04:00
Shel R
ec79919374 Merge pull request #986 from estuans/patch-2
Update List-of-Mastodon-instances.md
2017-04-07 22:11:55 -04:00
Shel R
acd9cc8a6d Merge branch 'master' into patch-2 2017-04-07 22:11:24 -04:00
Shel R
5ceb4cd28c Merge pull request #985 from Motoma/patch-1
Add Rich.GOP
2017-04-07 22:10:22 -04:00
Shel R
7c16bd512c Merge branch 'master' into patch-1 2017-04-07 22:09:55 -04:00
Shel R
16b69e67ca Merge pull request #982 from foxiehkins/master
Adding good-dragon.com instance to list
2017-04-07 22:09:15 -04:00
Shel R
fc78bf502e Merge branch 'master' into master 2017-04-07 22:08:54 -04:00
Shel R
f2dc24d00a Merge pull request #976 from shug0/patch-1
Adding masto.raildecake.fr, french instance 🌻🐘
2017-04-07 22:06:06 -04:00
Shel R
fc48d7d27d Merge branch 'master' into patch-1 2017-04-07 22:05:38 -04:00
Shel R
b3f3c54b6a Merge pull request #975 from tomfhowe/patch-4
Use autohiding scrollbars in Microsoft Edge
2017-04-07 22:03:35 -04:00
Shel R
17c734b017 Merge branch 'master' into patch-4 2017-04-07 22:02:26 -04:00
Shel R
355f92c89d Merge pull request #973 from ZiiX/patch-1
added instance
2017-04-07 21:59:51 -04:00
Shel R
03bc0d99b3 Merge branch 'master' into patch-1 2017-04-07 21:59:21 -04:00
Shel R
38a30c2844 Merge pull request #972 from amandavisconti/master
Added digitalhumanities.club instance
2017-04-07 21:56:57 -04:00
Shel R
8b56cdd949 Merge branch 'master' into master 2017-04-07 21:54:32 -04:00
Shel R
d38cf274c3 Merge pull request #970 from estuans/patch-1
Update Production-guide.md
2017-04-07 21:49:57 -04:00
Shel R
8eaeb0cba7 Merge branch 'master' into patch-1 2017-04-07 21:49:18 -04:00
Shel R
d25093c2c9 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
baad719a67 Merge branch 'master' into patch-1 2017-04-07 21:48:19 -04:00
Shel R
4932a4a708 Merge pull request #959 from mkody/patch-1
Added im-in.space
2017-04-07 21:45:06 -04:00
Shel R
c442d045a0 Merge branch 'master' into patch-1 2017-04-07 21:44:16 -04:00
Shel R
fa994bc24b 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
db00112413 Merge branch 'master' into patch-1 2017-04-07 21:42:10 -04:00
Shel R
c846c92553 Merge pull request #944 from VirtuBox/patch-1
Update List-of-Mastodon-instances.md
2017-04-07 21:35:34 -04:00
Shel R
ac2515e096 Merge branch 'master' into patch-1 2017-04-07 21:34:41 -04:00
Yann GUERN
33b00dd70f #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
07f42f0824 Fix #1165 - before_action was called before protect_from_forgery 2017-04-08 02:30:50 +02:00