Commit Graph

  • 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
  • 4e41cd9ab8 Merge pull request #1146 from tootsuite/fix-object-type-nil-exception Eugen 2017-04-07 13:08:51 +02:00
  • 10459241a8 Merge pull request #1145 from tootsuite/feature-customized-default-locale Eugen 2017-04-07 13:08:27 +02:00
  • c9b23a93c7 Merge branch 'master' into fix-object-type-nil-exception Eugen 2017-04-07 13:07:36 +02:00
  • 0adee18d73 Merge branch 'master' into feature-customized-default-locale Eugen 2017-04-07 13:07:03 +02:00
  • 8a6d8de60a Fix nil#object_type error Eugen Rochko 2017-04-07 13:05:34 +02:00
  • 786e6f94b9 Update Finnish translations, add sample Minio config (#954) Jantso Porali 2017-04-07 12:58:12 +02:00
  • 0c4e9fdda0 Merge branch 'master' into patch-4 Erwan Leboucher 2017-04-07 12:43:56 +02:00
  • e3a3422a65 Allow setting of default language through config Eugen Rochko 2017-04-07 12:40:26 +02:00
  • 624a9a7136 Re-add forgotten <author> element on standalone <entry> Eugen Rochko 2017-04-07 12:21:00 +02:00
  • 1c351709bc Force UTF8 encoding on generated XML (#1140) Eugen 2017-04-07 11:09:14 +02:00
  • 8e7d0bda40 Update List-of-Mastodon-instances.md Sergei Č 2017-04-07 11:54:41 +03:00
  • 6d6a429af8 Rewrite Atom generation from stream entries to use Ox instead of Nokogiri (#1124) Eugen 2017-04-07 05:56:56 +02:00
  • 5d43a9cae2 Email service options :P Jason Rhodes 2017-04-06 22:48:17 -04:00
  • 8a4ff30ceb updated instance hostname Tristan Mahé 2017-04-06 17:18:40 -07:00
  • 56f4a94e7b Update Production-guide.md Vladimir Mincev 2017-04-07 01:05:32 +02:00
  • 31597fd377 Low-hanging fruit of query optimization, these indices were missing Eugen Rochko 2017-04-07 00:04:09 +02:00
  • 4b08b7c502 Added masto.razrnet.fr YDrogen 2017-04-06 23:59:56 +02:00
  • 8cb7d157bd Merge pull request #1100 from mjankowski/mj-reduce-image-size Eugen 2017-04-06 22:59:48 +02:00
  • acf10a2c87 Merge pull request #1103 from alimony/vagrant-tweaks-01 Eugen 2017-04-06 22:58:44 +02:00
  • 7596de1aec Add a couple of network performance tweaks to Vagrantfile. Markus Amalthea Magnuson 2017-04-06 22:34:59 +02:00
  • 97ae53daa8 Reduce size of background-photo.jpeg Matt Jankowski 2017-04-06 16:24:57 -04:00
  • cd77c75d6c Merge pull request #1088 from Wonderfall/master Eugen 2017-04-06 21:35:10 +02:00
  • cfbd90cf44 Added pericles.world in the list of instances Tristan Mahé 2017-04-06 12:05:37 -07:00
  • ed2bfdee67 add Docker microbadger to README.md Wonderfall 2017-04-06 20:59:20 +02:00
  • a3318814e1 add metadata to Dockerfile Wonderfall 2017-04-06 20:57:16 +02:00
  • acf6436a99 Add manx.social instance isati 2017-04-06 19:31:25 +01:00
  • a0f1f9c664 Update List-of-Mastodon-instances.md Erwan Leboucher 2017-04-06 20:18:56 +02:00
  • f0d1107c53 Merge branch 'master' into patch-1 kadiix 2017-04-06 19:33:36 +02:00
  • 02c1ad5347 Update List-of-Mastodon-instances.md kadiix 2017-04-06 19:33:17 +02:00
  • fa494dbb1d Merge pull request #1038 from wade-r/optimize-dockerfile Eugen 2017-04-06 19:32:50 +02:00
  • a736b28646 Merge branch 'master' into patch-1 kadiix 2017-04-06 19:32:31 +02:00
  • c392c54271 Merge pull request #1042 from johnsudaar/feature/scalingo_one_click Eugen 2017-04-06 19:32:12 +02:00
  • 0d5d3c7abe Add an instance. kadiix 2017-04-06 19:15:57 +02:00
  • c441208e29 Merge branch 'master' into patch-1 VirtuBox 2017-04-06 19:11:39 +02:00
  • 5e63828917 Merge pull request #1048 from ashfurrow/slugignore Eugen 2017-04-06 19:09:45 +02:00
  • ea86f4db15 Merge pull request #1070 from alexgleason/patch-4 Eugen 2017-04-06 19:02:14 +02:00
  • a3d204e982 Linux users must enable NFS for Vagrant Alex Gleason 2017-04-06 12:16:39 -04:00
  • 07495cc13f Update List-of-Mastodon-instances.md awea 2017-04-06 18:07:15 +02:00
  • 6a88151eda Add meow.social Julien 2017-04-06 14:51:42 +02:00
  • 30619a6716 add my instance Lukas Fülling 2017-04-06 14:22:01 +02:00
  • a2adf84858 Updates slugignore. Ash Furrow 2017-04-06 07:53:48 -04:00
  • eadac4e7f4 Added an instance to the list Ray Alez 2017-04-06 03:12:34 -07:00
  • 0209b7d1b5 Update List-of-Mastodon-instances.md Yann GUERN 2017-04-06 11:07:33 +02:00
  • a2637c1720 Optimize Dockerfile Ryan Wade 2017-04-06 15:41:00 +08:00
  • c62696bc46 Update List-of-Mastodon-instances.md Markus R 2017-04-06 08:52:15 +02:00
  • 83530f0eef Add mastodon.elao.com instance Guewen FAIVRE 2017-04-06 08:46:16 +02:00
  • 73b8e67f4b Add infinimatix.net to instance list Derek Lewis 2017-04-06 01:11:16 -04:00
  • 51d7caaf19 Fix wrong pubsub channel on public timelines Eugen Rochko 2017-04-06 04:03:23 +02:00
  • b5d87500d2 Add Northeastern University Mastodon Jack Michaud 2017-04-05 20:58:21 -04:00
  • a9c0062e80 Merge pull request #1013 from blackle/master Eugen 2017-04-06 02:35:34 +02:00
  • dbd529109e Fix notifications delivered to wrong pubsub channel, optimized RemoveStatusService, slightly optimized FanOutOnWriteService again Eugen Rochko 2017-04-06 02:26:59 +02:00
  • 540d6efe88 Catch more errors in process_follows so it doesn't fail blackle 2017-04-05 20:04:13 -04:00
  • d025c5e593 Added off-the-clock.us to the list of instances Nick Gerakines 2017-04-05 19:19:44 -04:00
  • 7aede8e720 Description in instance list for mastodon.ninetailed.uk Ninetailed 2017-04-05 22:35:35 +01:00
  • dea6e47de0 Merge pull request #993 from foozmeat/patch-1 Eugen 2017-04-05 23:26:44 +02:00
  • 5442083b3c Split SalmonWorker into smaller parts, move profile updating into another job Eugen Rochko 2017-04-05 21:41:50 +02:00
  • c19e0f1212 Use NFS for the shared folder because it dramatically decreases latency for git operations. James Moore 2017-04-05 11:53:39 -07:00
  • bafbf63fcc Merge pull request #958 from yiskah/patch-1 Eugen 2017-04-05 20:48:19 +02:00
  • eb98c99924 Add mastodon.nuzgo.net Thibaut (Eychics) 2017-04-05 20:45:23 +02:00
  • 6b41fb2e6f Update List-of-Mastodon-instances.md ava 2017-04-05 21:44:13 +03:00
  • bf7cefa516 Merge branch 'master' into master André Lewin 2017-04-05 20:28:58 +02:00
  • 65b3a2a5a6 Adds mtndevelopment Brad Janke 2017-04-05 13:14:27 -05:00
  • d13d169922 Merge branch 'krainboltgreene-broadcast-to-worker' Eugen Rochko 2017-04-05 19:46:28 +02:00
  • 5b95be1c42 Replace calls to FeedManager#inline_render and #broadcast Eugen Rochko 2017-04-05 19:45:18 +02:00
  • d755ce96da Merge branch 'broadcast-to-worker' of https://github.com/krainboltgreene/mastodon into krainboltgreene-broadcast-to-worker Eugen Rochko 2017-04-05 19:29:46 +02:00
  • 29ffe1cad3 Make sure Rabl is using Oj Eugen Rochko 2017-04-05 18:51:15 +02:00
  • 8fa8004a2b Update List-of-Mastodon-instances.md Ben Field 2017-04-05 18:20:08 +01:00
  • e5566ac6a6 Add Rich.GOP Christopher Gilbert 2017-04-05 13:05:27 -04:00
  • c9ebd5d19f Fix wrong variable used in publish channel Eugen 2017-04-05 18:58:32 +02:00