]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoMerge pull request #1218 from R0ckweb/patch-2
Eugen [Sat, 8 Apr 2017 09:37:13 +0000 (11:37 +0200)]
Merge pull request #1218 from R0ckweb/patch-2

Fix #1141 on remote follow

8 years agoMerge pull request #1216 from tootsuite/fix-default-locale-regression
Eugen [Sat, 8 Apr 2017 09:36:43 +0000 (11:36 +0200)]
Merge pull request #1216 from tootsuite/fix-default-locale-regression

Fix #1165 - Default locale no longer breaks form submissions

8 years agoMerge pull request #1213 from tootsuite/fix-accounts-initial-case
Eugen [Sat, 8 Apr 2017 09:36:35 +0000 (11:36 +0200)]
Merge pull request #1213 from tootsuite/fix-accounts-initial-case

Fix #801 - Respect webfinger's canonical response of username/domain

8 years agoMerge pull request #1225 from tootsuite/yiskah-patch-1
Eugen [Sat, 8 Apr 2017 09:35:40 +0000 (11:35 +0200)]
Merge pull request #1225 from tootsuite/yiskah-patch-1

Close instance list to additions

8 years agoClose instance list to additions
Shel R [Sat, 8 Apr 2017 03:51:30 +0000 (23:51 -0400)]
Close instance list to additions

8 years agoMerge branch 'master' into fix-default-locale-regression
Kurtis Rainbolt-Greene [Sat, 8 Apr 2017 03:50:21 +0000 (20:50 -0700)]
Merge branch 'master' into fix-default-locale-regression

8 years agoMerge branch 'master' into patch-2
Kurtis Rainbolt-Greene [Sat, 8 Apr 2017 03:48:27 +0000 (20:48 -0700)]
Merge branch 'master' into patch-2

8 years agoMerge pull request #1137 from Noiwex/patch-1
Shel R [Sat, 8 Apr 2017 03:16:46 +0000 (23:16 -0400)]
Merge pull request #1137 from Noiwex/patch-1

Update List-of-Mastodon-instances.md

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 03:15:17 +0000 (23:15 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #1197 from blakebarnett/add_indigo_zone_instance
Shel R [Sat, 8 Apr 2017 03:10:25 +0000 (23:10 -0400)]
Merge pull request #1197 from blakebarnett/add_indigo_zone_instance

Add indigo.zone to list of instances

8 years agoMerge branch 'master' into add_indigo_zone_instance
Shel R [Sat, 8 Apr 2017 03:09:50 +0000 (23:09 -0400)]
Merge branch 'master' into add_indigo_zone_instance

8 years agoMerge pull request #1196 from mouse-reeve/list-oulipo-social
Shel R [Sat, 8 Apr 2017 03:09:09 +0000 (23:09 -0400)]
Merge pull request #1196 from mouse-reeve/list-oulipo-social

Adds Oulipo.social to Mastodons list

8 years agoMerge branch 'master' into list-oulipo-social
Shel R [Sat, 8 Apr 2017 03:08:41 +0000 (23:08 -0400)]
Merge branch 'master' into list-oulipo-social

8 years agoMerge pull request #1186 from Aguay-val/patch-2
Shel R [Sat, 8 Apr 2017 03:07:50 +0000 (23:07 -0400)]
Merge pull request #1186 from Aguay-val/patch-2

Add mastodon.fun

8 years agoMerge branch 'master' into patch-2
Shel R [Sat, 8 Apr 2017 03:05:08 +0000 (23:05 -0400)]
Merge branch 'master' into patch-2

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 03:03:07 +0000 (23:03 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #1107 from YDrogen/patch-1
Shel R [Sat, 8 Apr 2017 02:54:44 +0000 (22:54 -0400)]
Merge pull request #1107 from YDrogen/patch-1

Added masto.razrnet.fr

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:54:25 +0000 (22:54 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #1090 from gled-rs/master
Shel R [Sat, 8 Apr 2017 02:54:14 +0000 (22:54 -0400)]
Merge pull request #1090 from gled-rs/master

Added mastodon.host in the list of instances

8 years agoMerge branch 'master' into master
Shel R [Sat, 8 Apr 2017 02:53:42 +0000 (22:53 -0400)]
Merge branch 'master' into master

8 years agoMerge pull request #1085 from isati/patch-2
Shel R [Sat, 8 Apr 2017 02:49:34 +0000 (22:49 -0400)]
Merge pull request #1085 from isati/patch-2

Add manx.social instance

8 years agoMerge branch 'master' into patch-2
Shel R [Sat, 8 Apr 2017 02:49:14 +0000 (22:49 -0400)]
Merge branch 'master' into patch-2

8 years agoMerge pull request #1084 from genesixx/patch-4
Shel R [Sat, 8 Apr 2017 02:48:02 +0000 (22:48 -0400)]
Merge pull request #1084 from genesixx/patch-4

Update List-of-Mastodon-instances.md

8 years agoMerge branch 'master' into patch-4
Shel R [Sat, 8 Apr 2017 02:47:42 +0000 (22:47 -0400)]
Merge branch 'master' into patch-4

8 years agoMerge pull request #1074 from kadiix/patch-1
Shel R [Sat, 8 Apr 2017 02:47:00 +0000 (22:47 -0400)]
Merge pull request #1074 from kadiix/patch-1

Add an instance.

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:46:36 +0000 (22:46 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #1069 from Awea/master
Shel R [Sat, 8 Apr 2017 02:45:15 +0000 (22:45 -0400)]
Merge pull request #1069 from Awea/master

Add an instance

8 years agoMerge branch 'master' into master
Shel R [Sat, 8 Apr 2017 02:44:40 +0000 (22:44 -0400)]
Merge branch 'master' into master

8 years agoMerge pull request #1066 from jack-michaud/master
Shel R [Sat, 8 Apr 2017 02:43:46 +0000 (22:43 -0400)]
Merge pull request #1066 from jack-michaud/master

Add Northeastern University Mastodon

8 years agoMerge branch 'master' into master
Shel R [Sat, 8 Apr 2017 02:43:13 +0000 (22:43 -0400)]
Merge branch 'master' into master

8 years agoMerge pull request #1051 from Tiwy57/patch-1
Shel R [Sat, 8 Apr 2017 02:42:34 +0000 (22:42 -0400)]
Merge pull request #1051 from Tiwy57/patch-1

Add an instance

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:42:14 +0000 (22:42 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #1050 from lfuelling/patch-1
Shel R [Sat, 8 Apr 2017 02:41:37 +0000 (22:41 -0400)]
Merge pull request #1050 from lfuelling/patch-1

add my instance

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:41:07 +0000 (22:41 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #1046 from raymestalez/patch-2
Shel R [Sat, 8 Apr 2017 02:40:29 +0000 (22:40 -0400)]
Merge pull request #1046 from raymestalez/patch-2

Added an instance to the list

8 years agoMerge branch 'master' into patch-2
Shel R [Sat, 8 Apr 2017 02:39:59 +0000 (22:39 -0400)]
Merge branch 'master' into patch-2

8 years agoMerge pull request #1041 from R0ckweb/patch-1
Shel R [Sat, 8 Apr 2017 02:39:05 +0000 (22:39 -0400)]
Merge pull request #1041 from R0ckweb/patch-1

Update List-of-Mastodon-instances.md

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:38:37 +0000 (22:38 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #1036 from wirehack7/patch-1
Shel R [Sat, 8 Apr 2017 02:37:51 +0000 (22:37 -0400)]
Merge pull request #1036 from wirehack7/patch-1

Update List-of-Mastodon-instances.md

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:35:45 +0000 (22:35 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #1035 from gfaivre/add-elao-com-instance
Shel R [Sat, 8 Apr 2017 02:35:08 +0000 (22:35 -0400)]
Merge pull request #1035 from gfaivre/add-elao-com-instance

Add mastodon.elao.com instance

8 years agoMerge branch 'master' into add-elao-com-instance
Shel R [Sat, 8 Apr 2017 02:34:45 +0000 (22:34 -0400)]
Merge branch 'master' into add-elao-com-instance

8 years agoMerge pull request #1030 from derekcecillewis/add-infinimatix.net-instance
Shel R [Sat, 8 Apr 2017 02:34:10 +0000 (22:34 -0400)]
Merge pull request #1030 from derekcecillewis/add-infinimatix.net-instance

Add infinimatix.net to instance list

8 years agoMerge branch 'master' into add-infinimatix.net-instance
Shel R [Sat, 8 Apr 2017 02:33:40 +0000 (22:33 -0400)]
Merge branch 'master' into add-infinimatix.net-instance

8 years agoMerge pull request #1009 from ngerakines/patch-1
Shel R [Sat, 8 Apr 2017 02:25:45 +0000 (22:25 -0400)]
Merge pull request #1009 from ngerakines/patch-1

Added off-the-clock.us to the list of instances

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:23:50 +0000 (22:23 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #797 from AndreLewin/master
Shel R [Sat, 8 Apr 2017 02:21:48 +0000 (22:21 -0400)]
Merge pull request #797 from AndreLewin/master

Added Esperanto translation (eo)

8 years agoMerge branch 'master' into master
Shel R [Sat, 8 Apr 2017 02:21:21 +0000 (22:21 -0400)]
Merge branch 'master' into master

8 years agoMerge pull request #1006 from Ninetailed/master
Shel R [Sat, 8 Apr 2017 02:18:11 +0000 (22:18 -0400)]
Merge pull request #1006 from Ninetailed/master

Description in instance list for mastodon.ninetailed.uk

8 years agoMerge branch 'master' into master
Shel R [Sat, 8 Apr 2017 02:17:53 +0000 (22:17 -0400)]
Merge branch 'master' into master

8 years agoMerge pull request #992 from Eychics/master
Shel R [Sat, 8 Apr 2017 02:16:49 +0000 (22:16 -0400)]
Merge pull request #992 from Eychics/master

Add mastodon.nuzgo.net in instance list

8 years agoMerge branch 'master' into master
Shel R [Sat, 8 Apr 2017 02:15:55 +0000 (22:15 -0400)]
Merge branch 'master' into master

8 years agoMerge pull request #991 from vladooku/patch-1
Shel R [Sat, 8 Apr 2017 02:15:12 +0000 (22:15 -0400)]
Merge pull request #991 from vladooku/patch-1

Update List-of-Mastodon-instances.md

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:14:08 +0000 (22:14 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #989 from MTNDevelopment/master
Shel R [Sat, 8 Apr 2017 02:13:34 +0000 (22:13 -0400)]
Merge pull request #989 from MTNDevelopment/master

Updates instance list

8 years agoMerge branch 'master' into master
Shel R [Sat, 8 Apr 2017 02:13:06 +0000 (22:13 -0400)]
Merge branch 'master' into master

8 years agoMerge pull request #986 from estuans/patch-2
Shel R [Sat, 8 Apr 2017 02:11:55 +0000 (22:11 -0400)]
Merge pull request #986 from estuans/patch-2

Update List-of-Mastodon-instances.md

8 years agoMerge branch 'master' into patch-2
Shel R [Sat, 8 Apr 2017 02:11:24 +0000 (22:11 -0400)]
Merge branch 'master' into patch-2

8 years agoMerge pull request #985 from Motoma/patch-1
Shel R [Sat, 8 Apr 2017 02:10:22 +0000 (22:10 -0400)]
Merge pull request #985 from Motoma/patch-1

Add Rich.GOP

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:09:55 +0000 (22:09 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #982 from foxiehkins/master
Shel R [Sat, 8 Apr 2017 02:09:15 +0000 (22:09 -0400)]
Merge pull request #982 from foxiehkins/master

Adding good-dragon.com instance to list

8 years agoMerge branch 'master' into master
Shel R [Sat, 8 Apr 2017 02:08:54 +0000 (22:08 -0400)]
Merge branch 'master' into master

8 years agoMerge pull request #976 from shug0/patch-1
Shel R [Sat, 8 Apr 2017 02:06:06 +0000 (22:06 -0400)]
Merge pull request #976 from shug0/patch-1

Adding masto.raildecake.fr, french instance 🌻🐘

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:05:38 +0000 (22:05 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #975 from tomfhowe/patch-4
Shel R [Sat, 8 Apr 2017 02:03:35 +0000 (22:03 -0400)]
Merge pull request #975 from tomfhowe/patch-4

Use autohiding scrollbars in Microsoft Edge

8 years agoMerge branch 'master' into patch-4
Shel R [Sat, 8 Apr 2017 02:02:26 +0000 (22:02 -0400)]
Merge branch 'master' into patch-4

8 years agoMerge pull request #973 from ZiiX/patch-1
Shel R [Sat, 8 Apr 2017 01:59:51 +0000 (21:59 -0400)]
Merge pull request #973 from ZiiX/patch-1

added instance

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 01:59:21 +0000 (21:59 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #972 from amandavisconti/master
Shel R [Sat, 8 Apr 2017 01:56:57 +0000 (21:56 -0400)]
Merge pull request #972 from amandavisconti/master

Added digitalhumanities.club instance

8 years agoMerge branch 'master' into master
Shel R [Sat, 8 Apr 2017 01:54:32 +0000 (21:54 -0400)]
Merge branch 'master' into master

8 years agoMerge pull request #970 from estuans/patch-1
Shel R [Sat, 8 Apr 2017 01:49:57 +0000 (21:49 -0400)]
Merge pull request #970 from estuans/patch-1

Update Production-guide.md

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 01:49:18 +0000 (21:49 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #969 from Fortyseven/patch-1
Shel R [Sat, 8 Apr 2017 01:48:58 +0000 (21:48 -0400)]
Merge pull request #969 from Fortyseven/patch-1

Add social.bytestemplar.com to instances list

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 01:48:19 +0000 (21:48 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #959 from mkody/patch-1
Shel R [Sat, 8 Apr 2017 01:45:06 +0000 (21:45 -0400)]
Merge pull request #959 from mkody/patch-1

Added im-in.space

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 01:44:16 +0000 (21:44 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #953 from Technowix/patch-1
Shel R [Sat, 8 Apr 2017 01:43:20 +0000 (21:43 -0400)]
Merge pull request #953 from Technowix/patch-1

Add niu.moe, cuz it's kawaii

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 01:42:10 +0000 (21:42 -0400)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #944 from VirtuBox/patch-1
Shel R [Sat, 8 Apr 2017 01:35:34 +0000 (21:35 -0400)]
Merge pull request #944 from VirtuBox/patch-1

Update List-of-Mastodon-instances.md

8 years agoMerge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 01:34:41 +0000 (21:34 -0400)]
Merge branch 'master' into patch-1

8 years ago#1141 on remote follow
Yann GUERN [Sat, 8 Apr 2017 01:24:35 +0000 (03:24 +0200)]
#1141 on remote follow

The async action is send before persist, account.id not yet generated

Pull queue receive 'nil' so no profile update.

8 years agoFix #1165 - before_action was called before protect_from_forgery
Eugen Rochko [Sat, 8 Apr 2017 00:30:50 +0000 (02:30 +0200)]
Fix #1165 - before_action was called before protect_from_forgery

8 years agoFix #801 - Respect webfinger's canonical response of username/domain
Eugen Rochko [Fri, 7 Apr 2017 23:07:42 +0000 (01:07 +0200)]
Fix #801 - Respect webfinger's canonical response of username/domain

8 years agoMerge pull request #1204 from benklop/patch-1
Eugen [Fri, 7 Apr 2017 23:00:32 +0000 (01:00 +0200)]
Merge pull request #1204 from benklop/patch-1

Update Administration-guide.md

8 years agoMerge pull request #1200 from huertanix/patch-2
Eugen [Fri, 7 Apr 2017 23:00:06 +0000 (01:00 +0200)]
Merge pull request #1200 from huertanix/patch-2

Update Heroku-guide.md

8 years agoMerge pull request #1210 from raymestalez/patch-3
Eugen [Fri, 7 Apr 2017 22:59:02 +0000 (00:59 +0200)]
Merge pull request #1210 from raymestalez/patch-3

Add HackerNewsBot

8 years agoAdd HackerNewsBot
Ray Alez [Fri, 7 Apr 2017 22:56:02 +0000 (15:56 -0700)]
Add HackerNewsBot

I have created a bot that will post Hacker News stories with 100+ points. Adding it to the list.

8 years agoUpdate Administration-guide.md
benklop [Fri, 7 Apr 2017 22:31:50 +0000 (16:31 -0600)]
Update Administration-guide.md

the syntax for running the rake task wasn't correct.

8 years agoMerge pull request #1125 from jasonrhodes/patch-1
Eugen [Fri, 7 Apr 2017 22:24:38 +0000 (00:24 +0200)]
Merge pull request #1125 from jasonrhodes/patch-1

Email service options :P

8 years agoMerge pull request #1147 from fmauNeko/docker_smaller_image
Eugen [Fri, 7 Apr 2017 21:45:48 +0000 (23:45 +0200)]
Merge pull request #1147 from fmauNeko/docker_smaller_image

Fix npm/yarn cache cleaning

8 years agoUpdate Heroku-guide.md
David Huerta [Fri, 7 Apr 2017 21:44:32 +0000 (17:44 -0400)]
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.

8 years agoAdd indigo.zone to list of instances
Blake [Fri, 7 Apr 2017 21:10:37 +0000 (14:10 -0700)]
Add indigo.zone to list of instances

8 years agoAdds Oulipo.social to Mastodons list
Mouse Reeve [Fri, 7 Apr 2017 21:06:49 +0000 (14:06 -0700)]
Adds Oulipo.social to Mastodons list

This is a Mastodon with a particular constraint about
what symbols you can post.

8 years agoMerge pull request #1191 from d3vgru/master
Eugen [Fri, 7 Apr 2017 21:02:49 +0000 (23:02 +0200)]
Merge pull request #1191 from d3vgru/master

change suggested cipher for nginx

8 years agoFix npm/yarn cache cleaning
Florian Maunier [Fri, 7 Apr 2017 11:31:18 +0000 (13:31 +0200)]
Fix npm/yarn cache cleaning

8 years agoMerge pull request #1172 from mjankowski/mj-heroku-docs
Eugen [Fri, 7 Apr 2017 20:50:31 +0000 (22:50 +0200)]
Merge pull request #1172 from mjankowski/mj-heroku-docs

Update heroku instructions

8 years agoMerge pull request #1183 from thoughtbot/cp-post-status-service-specs
Eugen [Fri, 7 Apr 2017 20:30:28 +0000 (22:30 +0200)]
Merge pull request #1183 from thoughtbot/cp-post-status-service-specs

Add specs for PostStatusService

8 years agoMerge pull request #1184 from thoughtbot/extract-proper-status
Eugen [Fri, 7 Apr 2017 20:28:15 +0000 (22:28 +0200)]
Merge pull request #1184 from thoughtbot/extract-proper-status

DRY up reblog vs original status check

8 years agoMerge pull request #1192 from seekr/patch-2
Eugen [Fri, 7 Apr 2017 20:25:48 +0000 (22:25 +0200)]
Merge pull request #1192 from seekr/patch-2

typo

8 years agoMerge pull request #1193 from thoughtbot/status-specs
Eugen [Fri, 7 Apr 2017 20:25:10 +0000 (22:25 +0200)]
Merge pull request #1193 from thoughtbot/status-specs

Implement pending specs on Status