cat aescling's git repositories - mastodon.git/log

]> cat aescling's git repositories - mastodon.git/log

cat aescling's git repositories / mastodon.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Eugen [Sat, 8 Apr 2017 09:38:33 +0000 (11:38 +0200)]

Merge pull request #1198 from huertanix/patch-1

Update Heroku-guide.md

commit | commitdiff | tree

Eugen [Sat, 8 Apr 2017 09:37:51 +0000 (11:37 +0200)]

Merge pull request #1221 from rbaumert/patch-1

fixed a sentence in readme

commit | commitdiff | tree

Eugen [Sat, 8 Apr 2017 09:37:37 +0000 (11:37 +0200)]

Merge pull request #1224 from chrisheninger/patch-1

Add SVG version of logo to repo

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

rbaumert [Sat, 8 Apr 2017 04:39:24 +0000 (21:39 -0700)]

Merge branch 'master' into patch-1

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 03:51:30 +0000 (23:51 -0400)]

Close instance list to additions

commit | commitdiff | tree

Kurtis Rainbolt-Greene [Sat, 8 Apr 2017 03:50:21 +0000 (20:50 -0700)]

Merge branch 'master' into fix-default-locale-regression

commit | commitdiff | tree

Kurtis Rainbolt-Greene [Sat, 8 Apr 2017 03:48:27 +0000 (20:48 -0700)]

Merge branch 'master' into patch-2

commit | commitdiff | tree

Chris Heninger [Sat, 8 Apr 2017 03:40:18 +0000 (20:40 -0700)]

Add SVG version of logo to repo

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 03:15:17 +0000 (23:15 -0400)]

Merge branch 'master' into patch-1

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 03:09:50 +0000 (23:09 -0400)]

Merge branch 'master' into add_indigo_zone_instance

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 03:08:41 +0000 (23:08 -0400)]

Merge branch 'master' into list-oulipo-social

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 03:05:08 +0000 (23:05 -0400)]

Merge branch 'master' into patch-2

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 03:03:07 +0000 (23:03 -0400)]

Merge branch 'master' into patch-1

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:54:25 +0000 (22:54 -0400)]

Merge branch 'master' into patch-1

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:53:42 +0000 (22:53 -0400)]

Merge branch 'master' into master

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:49:14 +0000 (22:49 -0400)]

Merge branch 'master' into patch-2

commit | commitdiff | tree

rbaumert [Sat, 8 Apr 2017 02:48:46 +0000 (19:48 -0700)]

fixed a sentence in readme

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:47:42 +0000 (22:47 -0400)]

Merge branch 'master' into patch-4

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:47:00 +0000 (22:47 -0400)]

Merge pull request #1074 from kadiix/patch-1

Add an instance.

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:46:36 +0000 (22:46 -0400)]

Merge branch 'master' into patch-1

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:45:15 +0000 (22:45 -0400)]

Merge pull request #1069 from Awea/master

Add an instance

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:44:40 +0000 (22:44 -0400)]

Merge branch 'master' into master

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:43:13 +0000 (22:43 -0400)]

Merge branch 'master' into master

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:42:34 +0000 (22:42 -0400)]

Merge pull request #1051 from Tiwy57/patch-1

Add an instance

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:42:14 +0000 (22:42 -0400)]

Merge branch 'master' into patch-1

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:41:37 +0000 (22:41 -0400)]

Merge pull request #1050 from lfuelling/patch-1

add my instance

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:41:07 +0000 (22:41 -0400)]

Merge branch 'master' into patch-1

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:39:59 +0000 (22:39 -0400)]

Merge branch 'master' into patch-2

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:38:37 +0000 (22:38 -0400)]

Merge branch 'master' into patch-1

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:35:45 +0000 (22:35 -0400)]

Merge branch 'master' into patch-1

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:34:45 +0000 (22:34 -0400)]

Merge branch 'master' into add-elao-com-instance

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:33:40 +0000 (22:33 -0400)]

Merge branch 'master' into add-infinimatix.net-instance

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:23:50 +0000 (22:23 -0400)]

Merge branch 'master' into patch-1

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:21:48 +0000 (22:21 -0400)]

Merge pull request #797 from AndreLewin/master

Added Esperanto translation (eo)

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:21:21 +0000 (22:21 -0400)]

Merge branch 'master' into master

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:17:53 +0000 (22:17 -0400)]

Merge branch 'master' into master

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:15:55 +0000 (22:15 -0400)]

Merge branch 'master' into master

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:14:08 +0000 (22:14 -0400)]

Merge branch 'master' into patch-1

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:13:34 +0000 (22:13 -0400)]

Merge pull request #989 from MTNDevelopment/master

Updates instance list

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:13:06 +0000 (22:13 -0400)]

Merge branch 'master' into master

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:11:24 +0000 (22:11 -0400)]

Merge branch 'master' into patch-2

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:10:22 +0000 (22:10 -0400)]

Merge pull request #985 from Motoma/patch-1

Add Rich.GOP

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:09:55 +0000 (22:09 -0400)]

Merge branch 'master' into patch-1

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:08:54 +0000 (22:08 -0400)]

Merge branch 'master' into master

commit | commitdiff | tree

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 🌻🐘

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:05:38 +0000 (22:05 -0400)]

Merge branch 'master' into patch-1

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 02:02:26 +0000 (22:02 -0400)]

Merge branch 'master' into patch-4

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 01:59:51 +0000 (21:59 -0400)]

Merge pull request #973 from ZiiX/patch-1

added instance

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 01:59:21 +0000 (21:59 -0400)]

Merge branch 'master' into patch-1

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 01:56:57 +0000 (21:56 -0400)]

Merge pull request #972 from amandavisconti/master

Added digitalhumanities.club instance

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 01:54:32 +0000 (21:54 -0400)]

Merge branch 'master' into master

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 01:49:18 +0000 (21:49 -0400)]

Merge branch 'master' into patch-1

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 01:48:19 +0000 (21:48 -0400)]

Merge branch 'master' into patch-1

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 01:44:16 +0000 (21:44 -0400)]

Merge branch 'master' into patch-1

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 01:42:10 +0000 (21:42 -0400)]

Merge branch 'master' into patch-1

commit | commitdiff | tree

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

commit | commitdiff | tree

Shel R [Sat, 8 Apr 2017 01:34:41 +0000 (21:34 -0400)]

Merge branch 'master' into patch-1

commit | commitdiff | tree

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.

commit | commitdiff | tree

Eugen Rochko [Sat, 8 Apr 2017 00:30:50 +0000 (02:30 +0200)]

Fix #1165 - before_action was called before protect_from_forgery

commit | commitdiff | tree

David Huerta [Fri, 7 Apr 2017 23:46:07 +0000 (19:46 -0400)]

Merge branch 'master' into patch-1

commit | commitdiff | tree

Eugen Rochko [Fri, 7 Apr 2017 23:07:42 +0000 (01:07 +0200)]

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

commit | commitdiff | tree

Eugen [Fri, 7 Apr 2017 23:00:32 +0000 (01:00 +0200)]

Merge pull request #1204 from benklop/patch-1

Update Administration-guide.md

commit | commitdiff | tree

Eugen [Fri, 7 Apr 2017 23:00:06 +0000 (01:00 +0200)]

Merge pull request #1200 from huertanix/patch-2

Update Heroku-guide.md

commit | commitdiff | tree

Eugen [Fri, 7 Apr 2017 22:59:02 +0000 (00:59 +0200)]

Merge pull request #1210 from raymestalez/patch-3

Add HackerNewsBot

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Eugen [Fri, 7 Apr 2017 22:24:38 +0000 (00:24 +0200)]

Merge pull request #1125 from jasonrhodes/patch-1

Email service options :P

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

David Huerta [Fri, 7 Apr 2017 21:29:21 +0000 (17:29 -0400)]

Update Heroku-guide.md

Removing some of the confusion around what format S3 bucket names and regions should be entered as well as providing an example of an S3 policy that follows best security practices for this sort of thing.

commit | commitdiff | tree

Blake [Fri, 7 Apr 2017 21:10:37 +0000 (14:10 -0700)]

Add indigo.zone to list of instances

source code fur Kibicat Mastodon