451b7431c9
Merge branch 'master' into patch-2
2017-04-07 22:11:24 -04:00
530725ba3c
Merge pull request #985 from Motoma/patch-1
...
Add Rich.GOP
2017-04-07 22:10:22 -04:00
6efaee30b1
Merge branch 'master' into patch-1
2017-04-07 22:09:55 -04:00
698fe3686a
Merge pull request #982 from foxiehkins/master
...
Adding good-dragon.com instance to list
2017-04-07 22:09:15 -04:00
05be34a94b
Merge branch 'master' into master
2017-04-07 22:08:54 -04:00
cb58694a81
Merge pull request #976 from shug0/patch-1
...
Adding masto.raildecake.fr, french instance 🌻 🐘
2017-04-07 22:06:06 -04:00
e51b6bba94
Merge branch 'master' into patch-1
2017-04-07 22:05:38 -04:00
7f393a0b68
Merge pull request #975 from tomfhowe/patch-4
...
Use autohiding scrollbars in Microsoft Edge
2017-04-07 22:03:35 -04:00
9f43e3b428
Merge branch 'master' into patch-4
2017-04-07 22:02:26 -04:00
4a40b40324
Merge pull request #973 from ZiiX/patch-1
...
added instance
2017-04-07 21:59:51 -04:00
4c05f0e630
Merge branch 'master' into patch-1
2017-04-07 21:59:21 -04:00
d438eab673
Merge pull request #972 from amandavisconti/master
...
Added digitalhumanities.club instance
2017-04-07 21:56:57 -04:00
7b7bff04df
Merge branch 'master' into master
2017-04-07 21:54:32 -04:00
e659608797
Merge pull request #970 from estuans/patch-1
...
Update Production-guide.md
2017-04-07 21:49:57 -04:00
ed332693fe
Merge branch 'master' into patch-1
2017-04-07 21:49:18 -04:00
881e4277fd
Merge pull request #969 from Fortyseven/patch-1
...
Add social.bytestemplar.com to instances list
2017-04-07 21:48:58 -04:00
5dfc9854f1
Merge branch 'master' into patch-1
2017-04-07 21:48:19 -04:00
b300bb3b4e
Merge pull request #959 from mkody/patch-1
...
Added im-in.space
2017-04-07 21:45:06 -04:00
6d519e6fd1
Merge branch 'master' into patch-1
2017-04-07 21:44:16 -04:00
d2c9cc31de
Merge pull request #953 from Technowix/patch-1
...
Add niu.moe, cuz it's kawaii
2017-04-07 21:43:20 -04:00
065defefac
Merge branch 'master' into patch-1
2017-04-07 21:42:10 -04:00
6bfe068904
Merge pull request #944 from VirtuBox/patch-1
...
Update List-of-Mastodon-instances.md
2017-04-07 21:35:34 -04:00
bc237d17a7
Merge branch 'master' into patch-1
2017-04-07 21:34:41 -04:00
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
4b621188ad
Fix #1165 - before_action was called before protect_from_forgery
2017-04-08 02:30:50 +02:00
4fb24a70d3
Merge branch 'master' into patch-1
2017-04-07 19:46:07 -04:00
b2a7218ab7
Fix #801 - Respect webfinger's canonical response of username/domain
2017-04-08 01:07:42 +02:00
a872f2f4c6
Merge pull request #1204 from benklop/patch-1
...
Update Administration-guide.md
2017-04-08 01:00:32 +02:00
32a6f0884c
Merge pull request #1200 from huertanix/patch-2
...
Update Heroku-guide.md
2017-04-08 01:00:06 +02:00
a54af44975
Merge pull request #1210 from raymestalez/patch-3
...
Add HackerNewsBot
2017-04-08 00:59:02 +02:00
f113af5350
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
f578cf8331
Update Administration-guide.md
...
the syntax for running the rake task wasn't correct.
2017-04-07 16:31:50 -06:00
3cb13bdd84
Merge pull request #1125 from jasonrhodes/patch-1
...
Email service options :P
2017-04-08 00:24:38 +02:00
0bf31f5436
Merge pull request #1147 from fmauNeko/docker_smaller_image
...
Fix npm/yarn cache cleaning
2017-04-07 23:45:48 +02:00
a7ab2204d4
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
36a83cc4f9
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
30903d5f02
Add indigo.zone to list of instances
2017-04-07 14:10:37 -07:00
94536af96d
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
0b32b5108e
Merge pull request #1191 from d3vgru/master
...
change suggested cipher for nginx
2017-04-07 23:02:49 +02:00
12f1cdeed1
Fix npm/yarn cache cleaning
2017-04-07 22:51:52 +02:00
e2f024147c
Merge pull request #1172 from mjankowski/mj-heroku-docs
...
Update heroku instructions
2017-04-07 22:50:31 +02:00
1961825ff9
Merge pull request #1183 from thoughtbot/cp-post-status-service-specs
...
Add specs for PostStatusService
2017-04-07 22:30:28 +02:00
32748c0f71
Merge pull request #1184 from thoughtbot/extract-proper-status
...
DRY up reblog vs original status check
2017-04-07 22:28:15 +02:00
37a36b0bec
Merge pull request #1192 from seekr/patch-2
...
typo
2017-04-07 22:25:48 +02:00
c7d9b81d41
Merge pull request #1193 from thoughtbot/status-specs
...
Implement pending specs on Status
2017-04-07 22:25:10 +02:00
4fdeac21f4
Implement pending specs on Status
...
Implement the two pending specs on `Status`: `reblogs_count` and
`favourites_count`.
2017-04-07 15:36:06 -04:00
131f505fd0
typo
2017-04-07 16:33:13 -03:00
27012aaeb6
change suggested cipher for nginx
2017-04-07 14:10:39 -05:00
4c751d25e5
Add mastodon.fun
2017-04-07 20:33:52 +02:00
ad5ddd5e95
Use I18n for media attachment validation errors
...
These are currently user facing errors, but are not localized. This adds the
ability for these messages to be localized.
2017-04-07 14:23:18 -04:00
Shel R