3b9a56d4b3
Merge branch 'master' into master
2017-04-07 22:21:21 -04:00
a9624f7e11
Merge pull request #1006 from Ninetailed/master
...
Description in instance list for mastodon.ninetailed.uk
2017-04-07 22:18:11 -04:00
76c073d4fd
Merge branch 'master' into master
2017-04-07 22:17:53 -04:00
762a6592d6
Merge pull request #992 from Eychics/master
...
Add mastodon.nuzgo.net in instance list
2017-04-07 22:16:49 -04:00
71077a7605
Merge branch 'master' into master
2017-04-07 22:15:55 -04:00
a49e89df02
Merge pull request #991 from vladooku/patch-1
...
Update List-of-Mastodon-instances.md
2017-04-07 22:15:12 -04:00
0b90a13f45
Merge branch 'master' into patch-1
2017-04-07 22:14:08 -04:00
83ba97da9d
Merge pull request #989 from MTNDevelopment/master
...
Updates instance list
2017-04-07 22:13:34 -04:00
81b63dc586
Merge branch 'master' into master
2017-04-07 22:13:06 -04:00
ec79919374
Merge pull request #986 from estuans/patch-2
...
Update List-of-Mastodon-instances.md
2017-04-07 22:11:55 -04:00
acd9cc8a6d
Merge branch 'master' into patch-2
2017-04-07 22:11:24 -04:00
5ceb4cd28c
Merge pull request #985 from Motoma/patch-1
...
Add Rich.GOP
2017-04-07 22:10:22 -04:00
7c16bd512c
Merge branch 'master' into patch-1
2017-04-07 22:09:55 -04:00
16b69e67ca
Merge pull request #982 from foxiehkins/master
...
Adding good-dragon.com instance to list
2017-04-07 22:09:15 -04:00
fc78bf502e
Merge branch 'master' into master
2017-04-07 22:08:54 -04:00
f2dc24d00a
Merge pull request #976 from shug0/patch-1
...
Adding masto.raildecake.fr, french instance 🌻 🐘
2017-04-07 22:06:06 -04:00
fc48d7d27d
Merge branch 'master' into patch-1
2017-04-07 22:05:38 -04:00
b3f3c54b6a
Merge pull request #975 from tomfhowe/patch-4
...
Use autohiding scrollbars in Microsoft Edge
2017-04-07 22:03:35 -04:00
17c734b017
Merge branch 'master' into patch-4
2017-04-07 22:02:26 -04:00
355f92c89d
Merge pull request #973 from ZiiX/patch-1
...
added instance
2017-04-07 21:59:51 -04:00
03bc0d99b3
Merge branch 'master' into patch-1
2017-04-07 21:59:21 -04:00
38a30c2844
Merge pull request #972 from amandavisconti/master
...
Added digitalhumanities.club instance
2017-04-07 21:56:57 -04:00
8b56cdd949
Merge branch 'master' into master
2017-04-07 21:54:32 -04:00
d38cf274c3
Merge pull request #970 from estuans/patch-1
...
Update Production-guide.md
2017-04-07 21:49:57 -04:00
8eaeb0cba7
Merge branch 'master' into patch-1
2017-04-07 21:49:18 -04:00
d25093c2c9
Merge pull request #969 from Fortyseven/patch-1
...
Add social.bytestemplar.com to instances list
2017-04-07 21:48:58 -04:00
baad719a67
Merge branch 'master' into patch-1
2017-04-07 21:48:19 -04:00
4932a4a708
Merge pull request #959 from mkody/patch-1
...
Added im-in.space
2017-04-07 21:45:06 -04:00
c442d045a0
Merge branch 'master' into patch-1
2017-04-07 21:44:16 -04:00
fa994bc24b
Merge pull request #953 from Technowix/patch-1
...
Add niu.moe, cuz it's kawaii
2017-04-07 21:43:20 -04:00
db00112413
Merge branch 'master' into patch-1
2017-04-07 21:42:10 -04:00
c846c92553
Merge pull request #944 from VirtuBox/patch-1
...
Update List-of-Mastodon-instances.md
2017-04-07 21:35:34 -04:00
ac2515e096
Merge branch 'master' into patch-1
2017-04-07 21:34:41 -04:00
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
07f42f0824
Fix #1165 - before_action was called before protect_from_forgery
2017-04-08 02:30:50 +02:00
9c0ca6f26d
Merge branch 'master' into patch-1
2017-04-07 19:46:07 -04:00
81b7c81200
Fix #801 - Respect webfinger's canonical response of username/domain
2017-04-08 01:07:42 +02:00
714156e409
Merge pull request #1204 from benklop/patch-1
...
Update Administration-guide.md
2017-04-08 01:00:32 +02:00
9eefb51a2f
Merge pull request #1200 from huertanix/patch-2
...
Update Heroku-guide.md
2017-04-08 01:00:06 +02:00
b987fa33d7
Merge pull request #1210 from raymestalez/patch-3
...
Add HackerNewsBot
2017-04-08 00:59:02 +02:00
5b2be91d40
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
36e31bf45e
Update Administration-guide.md
...
the syntax for running the rake task wasn't correct.
2017-04-07 16:31:50 -06:00
4f6e874fce
Merge pull request #1125 from jasonrhodes/patch-1
...
Email service options :P
2017-04-08 00:24:38 +02:00
59ac5268e3
Merge pull request #1147 from fmauNeko/docker_smaller_image
...
Fix npm/yarn cache cleaning
2017-04-07 23:45:48 +02:00
7ab5218c65
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
fbfb94ca00
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.
2017-04-07 17:29:21 -04:00
7ede8d0b5a
Add indigo.zone to list of instances
2017-04-07 14:10:37 -07:00
be2e5c4f53
Adds Oulipo.social to Mastodons list
...
This is a Mastodon with a particular constraint about
what symbols you can post.
2017-04-07 14:06:49 -07:00
f74fb89cbd
Merge pull request #1191 from d3vgru/master
...
change suggested cipher for nginx
2017-04-07 23:02:49 +02:00
97ff85dc73
Fix npm/yarn cache cleaning
2017-04-07 22:51:52 +02:00
Shel R