Commit graph

  • 8bd2d377e5 Merge branch 'master' into patch-4 Shel R 2017-04-07 22:02:26 -04:00
  • 9f43e3b428 Merge branch 'master' into patch-4 Shel R 2017-04-07 22:02:26 -04:00
  • 29e9ed2422 Merge pull request #973 from ZiiX/patch-1 Shel R 2017-04-07 21:59:51 -04:00
  • 4a40b40324 Merge pull request #973 from ZiiX/patch-1 Shel R 2017-04-07 21:59:51 -04:00
  • dc56c7adf9 Merge branch 'master' into patch-1 Shel R 2017-04-07 21:59:21 -04:00
  • 4c05f0e630 Merge branch 'master' into patch-1 Shel R 2017-04-07 21:59:21 -04:00
  • 7fc331b9e4 Merge pull request #972 from amandavisconti/master Shel R 2017-04-07 21:56:57 -04:00
  • d438eab673 Merge pull request #972 from amandavisconti/master Shel R 2017-04-07 21:56:57 -04:00
  • 0279df9d4b Merge branch 'master' into master Shel R 2017-04-07 21:54:32 -04:00
  • 7b7bff04df Merge branch 'master' into master Shel R 2017-04-07 21:54:32 -04:00
  • 2eed089801 Merge pull request #970 from estuans/patch-1 Shel R 2017-04-07 21:49:57 -04:00
  • e659608797 Merge pull request #970 from estuans/patch-1 Shel R 2017-04-07 21:49:57 -04:00
  • bc9cb80491 Merge branch 'master' into patch-1 Shel R 2017-04-07 21:49:18 -04:00
  • ed332693fe Merge branch 'master' into patch-1 Shel R 2017-04-07 21:49:18 -04:00
  • 783e76abd5 Merge pull request #969 from Fortyseven/patch-1 Shel R 2017-04-07 21:48:58 -04:00
  • 881e4277fd Merge pull request #969 from Fortyseven/patch-1 Shel R 2017-04-07 21:48:58 -04:00
  • 32533d689a Merge branch 'master' into patch-1 Shel R 2017-04-07 21:48:19 -04:00
  • 5dfc9854f1 Merge branch 'master' into patch-1 Shel R 2017-04-07 21:48:19 -04:00
  • ecb542dcb1 Merge pull request #959 from mkody/patch-1 Shel R 2017-04-07 21:45:06 -04:00
  • b300bb3b4e Merge pull request #959 from mkody/patch-1 Shel R 2017-04-07 21:45:06 -04:00
  • 36557251db Merge branch 'master' into patch-1 Shel R 2017-04-07 21:44:16 -04:00
  • 6d519e6fd1 Merge branch 'master' into patch-1 Shel R 2017-04-07 21:44:16 -04:00
  • b135bddffe Merge pull request #953 from Technowix/patch-1 Shel R 2017-04-07 21:43:20 -04:00
  • d2c9cc31de Merge pull request #953 from Technowix/patch-1 Shel R 2017-04-07 21:43:20 -04:00
  • 1c05600381 Merge branch 'master' into patch-1 Shel R 2017-04-07 21:42:10 -04:00
  • 065defefac Merge branch 'master' into patch-1 Shel R 2017-04-07 21:42:10 -04:00
  • e60f7132ff Merge pull request #944 from VirtuBox/patch-1 Shel R 2017-04-07 21:35:34 -04:00
  • 6bfe068904 Merge pull request #944 from VirtuBox/patch-1 Shel R 2017-04-07 21:35:34 -04:00
  • ca9ef88dfc Merge branch 'master' into patch-1 Shel R 2017-04-07 21:34:41 -04:00
  • bc237d17a7 Merge branch 'master' into patch-1 Shel R 2017-04-07 21:34:41 -04:00
  • d480c1f1a5 #1141 on remote follow Yann GUERN 2017-04-08 03:24:35 +02:00
  • 485d75a805 #1141 on remote follow Yann GUERN 2017-04-08 03:24:35 +02:00
  • 17b8917bb1 Fix #1165 - before_action was called before protect_from_forgery Eugen Rochko 2017-04-08 02:30:50 +02:00
  • 4b621188ad Fix #1165 - before_action was called before protect_from_forgery Eugen Rochko 2017-04-08 02:30:50 +02:00
  • 2ddcde2319 Merge branch 'master' into patch-1 David Huerta 2017-04-07 19:46:07 -04:00
  • 4fb24a70d3 Merge branch 'master' into patch-1 David Huerta 2017-04-07 19:46:07 -04:00
  • eec3db6b6e Fix #801 - Respect webfinger's canonical response of username/domain Eugen Rochko 2017-04-08 01:07:42 +02:00
  • b2a7218ab7 Fix #801 - Respect webfinger's canonical response of username/domain Eugen Rochko 2017-04-08 01:07:42 +02:00
  • 632f797050 Merge pull request #1204 from benklop/patch-1 Eugen 2017-04-08 01:00:32 +02:00
  • a872f2f4c6 Merge pull request #1204 from benklop/patch-1 Eugen 2017-04-08 01:00:32 +02:00
  • 0f549feb72 Merge pull request #1200 from huertanix/patch-2 Eugen 2017-04-08 01:00:06 +02:00
  • 32a6f0884c Merge pull request #1200 from huertanix/patch-2 Eugen 2017-04-08 01:00:06 +02:00
  • 521a1541fa Merge pull request #1210 from raymestalez/patch-3 Eugen 2017-04-08 00:59:02 +02:00
  • a54af44975 Merge pull request #1210 from raymestalez/patch-3 Eugen 2017-04-08 00:59:02 +02:00
  • 6083b2f6aa Add HackerNewsBot Ray Alez 2017-04-07 15:56:02 -07:00
  • f113af5350 Add HackerNewsBot Ray Alez 2017-04-07 15:56:02 -07:00
  • 1c5b8de530 Update Administration-guide.md benklop 2017-04-07 16:31:50 -06:00
  • f578cf8331 Update Administration-guide.md benklop 2017-04-07 16:31:50 -06:00
  • fa52ece0a1 Merge pull request #1125 from jasonrhodes/patch-1 Eugen 2017-04-08 00:24:38 +02:00
  • 3cb13bdd84 Merge pull request #1125 from jasonrhodes/patch-1 Eugen 2017-04-08 00:24:38 +02:00
  • 0afcd43804 Merge pull request #1147 from fmauNeko/docker_smaller_image Eugen 2017-04-07 23:45:48 +02:00
  • 0bf31f5436 Merge pull request #1147 from fmauNeko/docker_smaller_image Eugen 2017-04-07 23:45:48 +02:00
  • b755c5ab70 Update Heroku-guide.md David Huerta 2017-04-07 17:44:32 -04:00
  • a7ab2204d4 Update Heroku-guide.md David Huerta 2017-04-07 17:44:32 -04:00
  • 7b1d25b3ab Update Heroku-guide.md David Huerta 2017-04-07 17:29:21 -04:00
  • 36a83cc4f9 Update Heroku-guide.md David Huerta 2017-04-07 17:29:21 -04:00
  • 169211984f Add indigo.zone to list of instances Blake 2017-04-07 14:10:37 -07:00
  • 30903d5f02 Add indigo.zone to list of instances Blake 2017-04-07 14:10:37 -07:00
  • ee8e0cb3dc Adds Oulipo.social to Mastodons list Mouse Reeve 2017-04-07 14:06:49 -07:00
  • 94536af96d Adds Oulipo.social to Mastodons list Mouse Reeve 2017-04-07 14:06:49 -07:00
  • 54ab1ec333 Merge pull request #1191 from d3vgru/master Eugen 2017-04-07 23:02:49 +02:00
  • 0b32b5108e Merge pull request #1191 from d3vgru/master Eugen 2017-04-07 23:02:49 +02:00
  • 2c76160a78 Fix npm/yarn cache cleaning Florian Maunier 2017-04-07 13:31:18 +02:00
  • 12f1cdeed1
    Fix npm/yarn cache cleaning Florian Maunier 2017-04-07 13:31:18 +02:00
  • 31724b819c Merge pull request #1172 from mjankowski/mj-heroku-docs Eugen 2017-04-07 22:50:31 +02:00
  • e2f024147c Merge pull request #1172 from mjankowski/mj-heroku-docs Eugen 2017-04-07 22:50:31 +02:00
  • 0c7e31be26 Merge pull request #1183 from thoughtbot/cp-post-status-service-specs Eugen 2017-04-07 22:30:28 +02:00
  • 1961825ff9 Merge pull request #1183 from thoughtbot/cp-post-status-service-specs Eugen 2017-04-07 22:30:28 +02:00
  • a751129d84 Merge pull request #1184 from thoughtbot/extract-proper-status Eugen 2017-04-07 22:28:15 +02:00
  • 32748c0f71 Merge pull request #1184 from thoughtbot/extract-proper-status Eugen 2017-04-07 22:28:15 +02:00
  • d7c19b9760 Merge pull request #1192 from seekr/patch-2 Eugen 2017-04-07 22:25:48 +02:00
  • 37a36b0bec Merge pull request #1192 from seekr/patch-2 Eugen 2017-04-07 22:25:48 +02:00
  • 92985e6bc2 Merge pull request #1193 from thoughtbot/status-specs Eugen 2017-04-07 22:25:10 +02:00
  • c7d9b81d41 Merge pull request #1193 from thoughtbot/status-specs Eugen 2017-04-07 22:25:10 +02:00
  • 84ef7877c6 Implement pending specs on Status Joël Quenneville 2017-04-07 15:30:36 -04:00
  • 4fdeac21f4 Implement pending specs on Status Joël Quenneville 2017-04-07 15:30:36 -04:00
  • 0c342694a3 typo seekr 2017-04-07 16:33:13 -03:00
  • 131f505fd0 typo seekr 2017-04-07 16:33:13 -03:00
  • 4362b1e738 change suggested cipher for nginx Ed Knutson 2017-04-07 14:10:39 -05:00
  • 27012aaeb6 change suggested cipher for nginx Ed Knutson 2017-04-07 14:10:39 -05:00
  • 5abdcb5539 Add mastodon.fun Aguay-val 2017-04-07 20:33:52 +02:00
  • 4c751d25e5 Add mastodon.fun Aguay-val 2017-04-07 20:33:52 +02:00
  • 69d2a2f2a2 Use I18n for media attachment validation errors Chad Pytel 2017-04-07 14:19:16 -04:00
  • ad5ddd5e95 Use I18n for media attachment validation errors Chad Pytel 2017-04-07 14:19:16 -04:00
  • b9090a76c6 Add specs for PostStatusService Chad Pytel 2017-04-07 13:48:38 -04:00
  • 13c0077003 Add specs for PostStatusService Chad Pytel 2017-04-07 13:48:38 -04:00
  • 1653b4ebf5 DRY up reblog vs original status check Joël Quenneville 2017-04-07 14:18:30 -04:00
  • d4c94fa004 DRY up reblog vs original status check Joël Quenneville 2017-04-07 14:18:30 -04:00
  • d963f1b99b Add specs for media attachment validations Chad Pytel 2017-04-07 12:50:43 -04:00
  • 38bec79811 Add specs for media attachment validations Chad Pytel 2017-04-07 12:50:43 -04:00
  • 911e99682f Update heroku instructions Matt Jankowski 2017-04-07 11:34:10 -04:00
  • 0f4fa59812 Update heroku instructions Matt Jankowski 2017-04-07 11:34:10 -04:00
  • d000f81587 Merge branch 'master' into master foxiehkins 2017-04-07 14:01:20 +01:00
  • 41396de7a9 Merge branch 'master' into master foxiehkins 2017-04-07 14:01:20 +01:00
  • 325c614ead Moved into a comment per feedback Jason Rhodes 2017-04-07 07:43:44 -04:00
  • 2ac8a590cd Moved into a comment per feedback Jason Rhodes 2017-04-07 07:43:44 -04:00
  • 1ec81ccec0 Merge branch 'master' into skylight Eugen Rochko 2017-04-07 13:09:25 +02:00
  • 5a9180e0a7 Merge pull request #1146 from tootsuite/fix-object-type-nil-exception Eugen 2017-04-07 13:08:51 +02:00
  • 4e41cd9ab8 Merge pull request #1146 from tootsuite/fix-object-type-nil-exception v1.1 Eugen 2017-04-07 13:08:51 +02:00
  • cff54f08a8 Merge pull request #1145 from tootsuite/feature-customized-default-locale Eugen 2017-04-07 13:08:27 +02:00
  • 10459241a8 Merge pull request #1145 from tootsuite/feature-customized-default-locale Eugen 2017-04-07 13:08:27 +02:00
  • d6445d9d45 Merge branch 'master' into fix-object-type-nil-exception Eugen 2017-04-07 13:07:36 +02:00
  • c9b23a93c7 Merge branch 'master' into fix-object-type-nil-exception Eugen 2017-04-07 13:07:36 +02:00
  • d16b8cf5ae Merge branch 'master' into feature-customized-default-locale Eugen 2017-04-07 13:07:03 +02:00
  • 0adee18d73 Merge branch 'master' into feature-customized-default-locale Eugen 2017-04-07 13:07:03 +02:00
  • ce1a04ddd9 Fix nil#object_type error Eugen Rochko 2017-04-07 13:05:34 +02:00
  • 8a6d8de60a Fix nil#object_type error Eugen Rochko 2017-04-07 13:05:34 +02:00
  • 61c99a0935 Update Finnish translations, add sample Minio config (#954) Jantso Porali 2017-04-07 12:58:12 +02:00
  • 786e6f94b9 Update Finnish translations, add sample Minio config (#954) Jantso Porali 2017-04-07 12:58:12 +02:00
  • 445a72f74e Merge branch 'master' into patch-4 Erwan Leboucher 2017-04-07 12:43:56 +02:00
  • 0c4e9fdda0 Merge branch 'master' into patch-4 Erwan Leboucher 2017-04-07 12:43:56 +02:00
  • 0bdcfd231c Allow setting of default language through config Eugen Rochko 2017-04-07 12:40:26 +02:00
  • e3a3422a65 Allow setting of default language through config Eugen Rochko 2017-04-07 12:40:26 +02:00
  • 3fa8505769 Merge branch 'master' into skylight Eugen Rochko 2017-04-07 12:25:10 +02:00
  • 5008c556da Re-add forgotten <author> element on standalone <entry> Eugen Rochko 2017-04-07 12:21:00 +02:00
  • 624a9a7136 Re-add forgotten <author> element on standalone <entry> Eugen Rochko 2017-04-07 12:21:00 +02:00
  • 011bcbf21f Merge branch 'feature-ox-fix' into skylight Eugen Rochko 2017-04-07 11:09:29 +02:00
  • 0d1128a4d7 Force UTF8 encoding on generated XML (#1140) Eugen 2017-04-07 11:09:14 +02:00
  • 1c351709bc Force UTF8 encoding on generated XML (#1140) Eugen 2017-04-07 11:09:14 +02:00
  • 6164662e1f Force UTF8 encoding on generated XML Eugen Rochko 2017-04-07 11:05:36 +02:00
  • 10f463fd42 Update List-of-Mastodon-instances.md Sergei Č 2017-04-07 11:54:41 +03:00
  • 8e7d0bda40 Update List-of-Mastodon-instances.md Sergei Č 2017-04-07 11:54:41 +03:00
  • ed4d2d8a69 Merge branch 'master' into skylight Eugen Rochko 2017-04-07 05:59:59 +02:00
  • 8fb2e10ba8 Rewrite Atom generation from stream entries to use Ox instead of Nokogiri (#1124) Eugen 2017-04-07 05:56:56 +02:00
  • 6d6a429af8 Rewrite Atom generation from stream entries to use Ox instead of Nokogiri (#1124) Eugen 2017-04-07 05:56:56 +02:00
  • 7ea18c0751 Email service options :P Jason Rhodes 2017-04-06 22:48:17 -04:00
  • 5d43a9cae2 Email service options :P Jason Rhodes 2017-04-06 22:48:17 -04:00
  • 3c7fcc99ff updated instance hostname Tristan Mahé 2017-04-06 17:18:40 -07:00
  • 8a4ff30ceb updated instance hostname Tristan Mahé 2017-04-06 17:18:40 -07:00
  • cdd888e75e Update Production-guide.md Vladimir Mincev 2017-04-07 01:05:32 +02:00
  • 56f4a94e7b Update Production-guide.md Vladimir Mincev 2017-04-07 01:05:32 +02:00
  • 453c15ab76 Merge branch 'master' into skylight Eugen Rochko 2017-04-07 00:06:58 +02:00
  • c6157d6dc5 Low-hanging fruit of query optimization, these indices were missing Eugen Rochko 2017-04-07 00:04:09 +02:00
  • 31597fd377 Low-hanging fruit of query optimization, these indices were missing Eugen Rochko 2017-04-07 00:04:09 +02:00
  • f070ef8c3a Added masto.razrnet.fr YDrogen 2017-04-06 23:59:56 +02:00
  • 4b08b7c502 Added masto.razrnet.fr YDrogen 2017-04-06 23:59:56 +02:00
  • 1407550a3d Merge pull request #1100 from mjankowski/mj-reduce-image-size Eugen 2017-04-06 22:59:48 +02:00
  • 8cb7d157bd Merge pull request #1100 from mjankowski/mj-reduce-image-size Eugen 2017-04-06 22:59:48 +02:00
  • 63933b3808 Merge pull request #1103 from alimony/vagrant-tweaks-01 Eugen 2017-04-06 22:58:44 +02:00
  • acf10a2c87 Merge pull request #1103 from alimony/vagrant-tweaks-01 Eugen 2017-04-06 22:58:44 +02:00
  • a80d302c9a Add a couple of network performance tweaks to Vagrantfile. Markus Amalthea Magnuson 2017-04-06 22:34:59 +02:00
  • 7596de1aec Add a couple of network performance tweaks to Vagrantfile. Markus Amalthea Magnuson 2017-04-06 22:34:59 +02:00
  • e6defaf772 Reduce size of background-photo.jpeg Matt Jankowski 2017-04-06 16:24:57 -04:00
  • 97ae53daa8 Reduce size of background-photo.jpeg Matt Jankowski 2017-04-06 16:24:57 -04:00
  • 8134a1577d Merge pull request #1088 from Wonderfall/master Eugen 2017-04-06 21:35:10 +02:00
  • cd77c75d6c Merge pull request #1088 from Wonderfall/master Eugen 2017-04-06 21:35:10 +02:00
  • b4228bea19 Added pericles.world in the list of instances Tristan Mahé 2017-04-06 12:05:37 -07:00
  • cfbd90cf44 Added pericles.world in the list of instances Tristan Mahé 2017-04-06 12:05:37 -07:00
  • bb44ff9fdf add Docker microbadger to README.md Wonderfall 2017-04-06 20:59:20 +02:00
  • ed2bfdee67
    add Docker microbadger to README.md Wonderfall 2017-04-06 20:59:20 +02:00
  • e25c224a3d add metadata to Dockerfile Wonderfall 2017-04-06 20:57:16 +02:00
  • a3318814e1
    add metadata to Dockerfile Wonderfall 2017-04-06 20:57:16 +02:00
  • 2dc2003b99 Disable prepared_statements in production to allow use of pgbouncer Eugen Rochko 2017-04-06 20:50:13 +02:00
  • 4d1217d8f9 Merge branch 'master' into skylight Eugen Rochko 2017-04-06 20:50:05 +02:00
  • 3ae9d44830 Add manx.social instance isati 2017-04-06 19:31:25 +01:00
  • acf6436a99 Add manx.social instance isati 2017-04-06 19:31:25 +01:00
  • a49204155e Update List-of-Mastodon-instances.md Erwan Leboucher 2017-04-06 20:18:56 +02:00
  • a0f1f9c664 Update List-of-Mastodon-instances.md Erwan Leboucher 2017-04-06 20:18:56 +02:00
  • 6c7fb3f752 Merge branch 'master' into patch-1 kadiix 2017-04-06 19:33:36 +02:00
  • f0d1107c53 Merge branch 'master' into patch-1 kadiix 2017-04-06 19:33:36 +02:00
  • ffa5bcd895 Update List-of-Mastodon-instances.md kadiix 2017-04-06 19:33:17 +02:00
  • 02c1ad5347 Update List-of-Mastodon-instances.md kadiix 2017-04-06 19:33:17 +02:00
  • ca439770d9 Merge pull request #1038 from wade-r/optimize-dockerfile Eugen 2017-04-06 19:32:50 +02:00
  • fa494dbb1d Merge pull request #1038 from wade-r/optimize-dockerfile Eugen 2017-04-06 19:32:50 +02:00
  • 5d3a3afac4 Merge branch 'master' into patch-1 kadiix 2017-04-06 19:32:31 +02:00
  • a736b28646 Merge branch 'master' into patch-1 kadiix 2017-04-06 19:32:31 +02:00
  • 2be516e6fb Merge pull request #1042 from johnsudaar/feature/scalingo_one_click Eugen 2017-04-06 19:32:12 +02:00
  • c392c54271 Merge pull request #1042 from johnsudaar/feature/scalingo_one_click Eugen 2017-04-06 19:32:12 +02:00
  • ff94de8721 Add an instance. kadiix 2017-04-06 19:15:57 +02:00
  • 0d5d3c7abe Add an instance. kadiix 2017-04-06 19:15:57 +02:00
  • b5f7fc9638 Merge branch 'master' into patch-1 VirtuBox 2017-04-06 19:11:39 +02:00
  • c441208e29 Merge branch 'master' into patch-1 VirtuBox 2017-04-06 19:11:39 +02:00
  • 203fe80577 Merge pull request #1048 from ashfurrow/slugignore Eugen 2017-04-06 19:09:45 +02:00
  • 5e63828917 Merge pull request #1048 from ashfurrow/slugignore Eugen 2017-04-06 19:09:45 +02:00
  • 3a3675c14d Merge pull request #1070 from alexgleason/patch-4 Eugen 2017-04-06 19:02:14 +02:00
  • ea86f4db15 Merge pull request #1070 from alexgleason/patch-4 Eugen 2017-04-06 19:02:14 +02:00
  • 979e776347 Linux users must enable NFS for Vagrant Alex Gleason 2017-04-06 12:16:39 -04:00
  • a3d204e982 Linux users must enable NFS for Vagrant Alex Gleason 2017-04-06 12:16:39 -04:00
  • c07491fde4 Update List-of-Mastodon-instances.md awea 2017-04-06 18:07:15 +02:00
  • 07495cc13f Update List-of-Mastodon-instances.md awea 2017-04-06 18:07:15 +02:00
  • b350142b03 Add meow.social Julien 2017-04-06 14:51:42 +02:00
  • 6a88151eda Add meow.social Julien 2017-04-06 14:51:42 +02:00
  • 5e56f067d8 add my instance Lukas Fülling 2017-04-06 14:22:01 +02:00
  • 30619a6716 add my instance Lukas Fülling 2017-04-06 14:22:01 +02:00
  • c07a3ade44 Updates slugignore. Ash Furrow 2017-04-06 07:53:48 -04:00
  • a2adf84858
    Updates slugignore. Ash Furrow 2017-04-06 07:53:48 -04:00
  • f20c0e6662 Added an instance to the list Ray Alez 2017-04-06 03:12:34 -07:00
  • eadac4e7f4 Added an instance to the list Ray Alez 2017-04-06 03:12:34 -07:00
  • 240bd3e013 Update List-of-Mastodon-instances.md Yann GUERN 2017-04-06 11:07:33 +02:00
  • 0209b7d1b5 Update List-of-Mastodon-instances.md Yann GUERN 2017-04-06 11:07:33 +02:00
  • dd3d12c464 Optimize Dockerfile Ryan Wade 2017-04-06 15:41:00 +08:00
  • a2637c1720 Optimize Dockerfile Ryan Wade 2017-04-06 15:41:00 +08:00
  • e31c87f293 Update List-of-Mastodon-instances.md Markus R 2017-04-06 08:52:15 +02:00
  • c62696bc46 Update List-of-Mastodon-instances.md Markus R 2017-04-06 08:52:15 +02:00
  • ead9afc5a6 Add mastodon.elao.com instance Guewen FAIVRE 2017-04-06 08:46:16 +02:00
  • 83530f0eef
    Add mastodon.elao.com instance Guewen FAIVRE 2017-04-06 08:46:16 +02:00
  • 25d1c74222 Add infinimatix.net to instance list Derek Lewis 2017-04-06 01:11:16 -04:00
  • 73b8e67f4b Add infinimatix.net to instance list Derek Lewis 2017-04-06 01:11:16 -04:00
  • 12edb6f48d Fix wrong pubsub channel on public timelines Eugen Rochko 2017-04-06 04:03:23 +02:00
  • 51d7caaf19 Fix wrong pubsub channel on public timelines Eugen Rochko 2017-04-06 04:03:23 +02:00