mastodon

vbatts/mastodon

Fork 0

Commit graph

a25a384af3 Merge pull request #1107 from YDrogen/patch-1 Shel R 2017-04-07 22:54:44 -04:00
971c4de18c Merge branch 'master' into patch-1 Shel R 2017-04-07 22:54:25 -04:00
394c8ef680 Merge pull request #1090 from gled-rs/master Shel R 2017-04-07 22:54:14 -04:00
3c5b0c55cb Merge branch 'master' into master Shel R 2017-04-07 22:53:42 -04:00
0dcf3c6abe Merge pull request #1085 from isati/patch-2 Shel R 2017-04-07 22:49:34 -04:00
b67b60fec3 Merge branch 'master' into patch-2 Shel R 2017-04-07 22:49:14 -04:00
2c0ef75f58 fixed a sentence in readme rbaumert 2017-04-07 19:48:46 -07:00
cc16fa7513 Merge pull request #1084 from genesixx/patch-4 Shel R 2017-04-07 22:48:02 -04:00
d6827e38a6 Merge branch 'master' into patch-4 Shel R 2017-04-07 22:47:42 -04:00
29ed448445 Merge pull request #1074 from kadiix/patch-1 Shel R 2017-04-07 22:47:00 -04:00
e7d7a99fbc Merge branch 'master' into patch-1 Shel R 2017-04-07 22:46:36 -04:00
8d27de32b3 Merge pull request #1069 from Awea/master Shel R 2017-04-07 22:45:15 -04:00
abab82ec1e Merge branch 'master' into master Shel R 2017-04-07 22:44:40 -04:00
f0797bf8ce Merge pull request #1066 from jack-michaud/master Shel R 2017-04-07 22:43:46 -04:00
38c5130930 Merge branch 'master' into master Shel R 2017-04-07 22:43:13 -04:00
ee8af9083a Merge pull request #1051 from Tiwy57/patch-1 Shel R 2017-04-07 22:42:34 -04:00
c9f15f7991 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:42:14 -04:00
91afe1f8fd Merge pull request #1050 from lfuelling/patch-1 Shel R 2017-04-07 22:41:37 -04:00
9edee2e64f Merge branch 'master' into patch-1 Shel R 2017-04-07 22:41:07 -04:00
d7e1a282fe Merge pull request #1046 from raymestalez/patch-2 Shel R 2017-04-07 22:40:29 -04:00
c890b86ef6 Merge branch 'master' into patch-2 Shel R 2017-04-07 22:39:59 -04:00
5b571fc434 Merge branch 'master' into master Valentin Ouvrard 2017-04-08 13:39:31 +11:00
3e4eb9c95f Merge branch 'master' into master Valentin Ouvrard 2017-04-08 13:39:09 +11:00
ceba26d527 Merge pull request #1041 from R0ckweb/patch-1 Shel R 2017-04-07 22:39:05 -04:00
7826b5e93d Merge branch 'master' into patch-1 Shel R 2017-04-07 22:38:37 -04:00
fc7b830719 Merge pull request #1036 from wirehack7/patch-1 Shel R 2017-04-07 22:37:51 -04:00
c945f29e96 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:35:45 -04:00
0d4d42dce6 Merge pull request #1035 from gfaivre/add-elao-com-instance Shel R 2017-04-07 22:35:08 -04:00
cf03634e74 Merge branch 'master' into add-elao-com-instance Shel R 2017-04-07 22:34:45 -04:00
698d74a15f Merge pull request #1030 from derekcecillewis/add-infinimatix.net-instance Shel R 2017-04-07 22:34:10 -04:00
d7d165db5b Merge branch 'master' into add-infinimatix.net-instance Shel R 2017-04-07 22:33:40 -04:00
d7f4300ee3 Merge pull request #1009 from ngerakines/patch-1 Shel R 2017-04-07 22:25:45 -04:00
7632178300 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:23:50 -04:00
e4e948a21b Merge pull request #797 from AndreLewin/master Shel R 2017-04-07 22:21:48 -04:00
fef478781d Merge branch 'master' into master Shel R 2017-04-07 22:21:21 -04:00
c1a553d2c2 Merge pull request #1006 from Ninetailed/master Shel R 2017-04-07 22:18:11 -04:00
3e8c1a1c36 Merge branch 'master' into master Shel R 2017-04-07 22:17:53 -04:00
9fd8bbe15c Merge pull request #992 from Eychics/master Shel R 2017-04-07 22:16:49 -04:00
1b42f717f2 Merge branch 'master' into master Shel R 2017-04-07 22:15:55 -04:00
7004c69204 Merge pull request #991 from vladooku/patch-1 Shel R 2017-04-07 22:15:12 -04:00
9981972844 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:14:08 -04:00
5f61ef2417 Merge pull request #989 from MTNDevelopment/master Shel R 2017-04-07 22:13:34 -04:00
cf13c97cb2 Merge branch 'master' into master Shel R 2017-04-07 22:13:06 -04:00
90a408f592 Merge pull request #986 from estuans/patch-2 Shel R 2017-04-07 22:11:55 -04:00
451b7431c9 Merge branch 'master' into patch-2 Shel R 2017-04-07 22:11:24 -04:00
530725ba3c Merge pull request #985 from Motoma/patch-1 Shel R 2017-04-07 22:10:22 -04:00
6efaee30b1 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:09:55 -04:00
698fe3686a Merge pull request #982 from foxiehkins/master Shel R 2017-04-07 22:09:15 -04:00
05be34a94b Merge branch 'master' into master Shel R 2017-04-07 22:08:54 -04:00
cb58694a81 Merge pull request #976 from shug0/patch-1 Shel R 2017-04-07 22:06:06 -04:00
e51b6bba94 Merge branch 'master' into patch-1 Shel R 2017-04-07 22:05:38 -04:00
7f393a0b68 Merge pull request #975 from tomfhowe/patch-4 Shel R 2017-04-07 22:03:35 -04:00
9f43e3b428 Merge branch 'master' into patch-4 Shel R 2017-04-07 22:02:26 -04:00
4a40b40324 Merge pull request #973 from ZiiX/patch-1 Shel R 2017-04-07 21:59:51 -04:00
4c05f0e630 Merge branch 'master' into patch-1 Shel R 2017-04-07 21:59:21 -04:00
d438eab673 Merge pull request #972 from amandavisconti/master Shel R 2017-04-07 21:56:57 -04:00
7b7bff04df Merge branch 'master' into master Shel R 2017-04-07 21:54:32 -04:00
e659608797 Merge pull request #970 from estuans/patch-1 Shel R 2017-04-07 21:49:57 -04:00
ed332693fe Merge branch 'master' into patch-1 Shel R 2017-04-07 21:49:18 -04:00
881e4277fd Merge pull request #969 from Fortyseven/patch-1 Shel R 2017-04-07 21:48:58 -04:00
5dfc9854f1 Merge branch 'master' into patch-1 Shel R 2017-04-07 21:48:19 -04:00
b300bb3b4e Merge pull request #959 from mkody/patch-1 Shel R 2017-04-07 21:45:06 -04:00
6d519e6fd1 Merge branch 'master' into patch-1 Shel R 2017-04-07 21:44:16 -04:00
d2c9cc31de Merge pull request #953 from Technowix/patch-1 Shel R 2017-04-07 21:43:20 -04:00
065defefac Merge branch 'master' into patch-1 Shel R 2017-04-07 21:42:10 -04:00
6bfe068904 Merge pull request #944 from VirtuBox/patch-1 Shel R 2017-04-07 21:35:34 -04:00
bc237d17a7 Merge branch 'master' into patch-1 Shel R 2017-04-07 21:34:41 -04:00
485d75a805 #1141 on remote follow Yann GUERN 2017-04-08 03:24:35 +02:00
4b621188ad Fix #1165 - before_action was called before protect_from_forgery Eugen Rochko 2017-04-08 02:30:50 +02:00
4fb24a70d3 Merge branch 'master' into patch-1 David Huerta 2017-04-07 19:46:07 -04:00
b2a7218ab7 Fix #801 - Respect webfinger's canonical response of username/domain Eugen Rochko 2017-04-08 01:07:42 +02:00
a872f2f4c6 Merge pull request #1204 from benklop/patch-1 Eugen 2017-04-08 01:00:32 +02:00
32a6f0884c Merge pull request #1200 from huertanix/patch-2 Eugen 2017-04-08 01:00:06 +02:00
a54af44975 Merge pull request #1210 from raymestalez/patch-3 Eugen 2017-04-08 00:59:02 +02:00
f113af5350 Add HackerNewsBot Ray Alez 2017-04-07 15:56:02 -07:00
f578cf8331 Update Administration-guide.md benklop 2017-04-07 16:31:50 -06:00
3cb13bdd84 Merge pull request #1125 from jasonrhodes/patch-1 Eugen 2017-04-08 00:24:38 +02:00
0bf31f5436 Merge pull request #1147 from fmauNeko/docker_smaller_image Eugen 2017-04-07 23:45:48 +02:00
a7ab2204d4 Update Heroku-guide.md David Huerta 2017-04-07 17:44:32 -04:00
36a83cc4f9 Update Heroku-guide.md David Huerta 2017-04-07 17:29:21 -04:00
30903d5f02 Add indigo.zone to list of instances Blake 2017-04-07 14:10:37 -07:00
94536af96d Adds Oulipo.social to Mastodons list Mouse Reeve 2017-04-07 14:06:49 -07:00
0b32b5108e Merge pull request #1191 from d3vgru/master Eugen 2017-04-07 23:02:49 +02:00
12f1cdeed1

Fix npm/yarn cache cleaning Florian Maunier 2017-04-07 13:31:18 +02:00
e2f024147c Merge pull request #1172 from mjankowski/mj-heroku-docs Eugen 2017-04-07 22:50:31 +02:00
1961825ff9 Merge pull request #1183 from thoughtbot/cp-post-status-service-specs Eugen 2017-04-07 22:30:28 +02:00
32748c0f71 Merge pull request #1184 from thoughtbot/extract-proper-status Eugen 2017-04-07 22:28:15 +02:00
37a36b0bec Merge pull request #1192 from seekr/patch-2 Eugen 2017-04-07 22:25:48 +02:00
c7d9b81d41 Merge pull request #1193 from thoughtbot/status-specs Eugen 2017-04-07 22:25:10 +02:00
4fdeac21f4 Implement pending specs on Status Joël Quenneville 2017-04-07 15:30:36 -04:00
131f505fd0 typo seekr 2017-04-07 16:33:13 -03:00
27012aaeb6 change suggested cipher for nginx Ed Knutson 2017-04-07 14:10:39 -05:00
4c751d25e5 Add mastodon.fun Aguay-val 2017-04-07 20:33:52 +02:00
ad5ddd5e95 Use I18n for media attachment validation errors Chad Pytel 2017-04-07 14:19:16 -04:00
13c0077003 Add specs for PostStatusService Chad Pytel 2017-04-07 13:48:38 -04:00
d4c94fa004 DRY up reblog vs original status check Joël Quenneville 2017-04-07 14:18:30 -04:00
38bec79811 Add specs for media attachment validations Chad Pytel 2017-04-07 12:50:43 -04:00
0f4fa59812 Update heroku instructions Matt Jankowski 2017-04-07 11:34:10 -04:00
41396de7a9 Merge branch 'master' into master foxiehkins 2017-04-07 14:01:20 +01:00
2ac8a590cd Moved into a comment per feedback Jason Rhodes 2017-04-07 07:43:44 -04:00