Commit Graph

  • a6d718d94a Use HTTP Accept-Language to detect locale awea 2017-04-07 16:37:57 +0200
  • 3561b2b580 Added missing files Nico Van Belle 2017-04-07 16:47:52 +0200
  • 41be1c7353 added Dutch(nl) as a language Nico Van Belle 2017-04-07 16:08:22 +0200
  • d836afacfc Minor correction on Corsican translation palindromordnilap 2017-04-07 16:00:28 +0200
  • 6b34b08e3a Update french translation Thomas Citharel 2017-04-07 13:51:11 +0200
  • ed26ba2e99 Merge branch 'master' into master Ben Roberts 2017-04-07 09:12:34 -0400
  • c1882792dd Merge branch 'master' into master Ben Roberts 2017-04-07 09:07:59 -0400
  • 41396de7a9 Merge branch 'master' into master foxiehkins 2017-04-07 14:01:20 +0100
  • 6fab1e099e Adding Corsican translation palindromordnilap 2017-04-07 14:55:44 +0200
  • a390c1f373 Adding Corsican translation palindromordnilap 2017-04-07 14:54:30 +0200
  • b884c460fe Adding Corsican translation palindromordnilap 2017-04-07 14:53:46 +0200
  • 815d31e913 Adding Corsican translation palindromordnilap 2017-04-07 14:52:13 +0200
  • bb1702a238 Adding Corsican translation palindromordnilap 2017-04-07 14:51:18 +0200
  • 431e14ca31 Add Corsican translation palindromordnilap 2017-04-07 14:50:23 +0200
  • 10d99bf864 Merge branch 'master' of https://github.com/JantsoP/mastodon Jantso Porali 2017-04-07 14:34:14 +0200
  • 19b56e7b50 Hopefully fix a display bug Alda Marteau-Hardi 2017-04-07 13:49:58 +0200
  • 2ac8a590cd Moved into a comment per feedback Jason Rhodes 2017-04-07 07:43:44 -0400
  • 2213e7d388 I forgot one in french Alda Marteau-Hardi 2017-04-07 13:34:19 +0200
  • 2c48fb084a MOAR POWER Alda Marteau-Hardi 2017-04-07 13:13:37 +0200
  • 9a722a5db3 More witches translations Alda Marteau-Hardi 2017-04-07 13:13:23 +0200
  • 1ec81ccec0 Merge branch 'master' into skylight Eugen Rochko 2017-04-07 13:09:25 +0200
  • 5988884e49 Merge 162f4492d0 into 4e41cd9ab8 Florian Knodt 2017-04-07 11:08:56 +0000
  • 4e41cd9ab8 Merge pull request #1146 from tootsuite/fix-object-type-nil-exception v1.1 Eugen 2017-04-07 13:08:51 +0200
  • 10459241a8 Merge pull request #1145 from tootsuite/feature-customized-default-locale Eugen 2017-04-07 13:08:27 +0200
  • c9b23a93c7 Merge branch 'master' into fix-object-type-nil-exception Eugen 2017-04-07 13:07:36 +0200
  • 0adee18d73 Merge branch 'master' into feature-customized-default-locale Eugen 2017-04-07 13:07:03 +0200
  • 8a6d8de60a Fix nil#object_type error Eugen Rochko 2017-04-07 13:05:34 +0200
  • 054da4b30c Merge remote-tracking branch 'refs/remotes/tootsuite/master' Jantso Porali 2017-04-07 13:00:26 +0200
  • 786e6f94b9 Update Finnish translations, add sample Minio config (#954) Jantso Porali 2017-04-07 12:58:12 +0200
  • 0941957a2d Merge branch 'master' into master Jantso Porali 2017-04-07 12:55:56 +0200
  • 1f837f9ee3 updated minio config by dev request Jantso Porali 2017-04-07 12:54:43 +0200
  • 2d1a08e793 remove language change due breaking emails Jantso Porali 2017-04-07 12:52:58 +0200
  • 0c4e9fdda0 Merge branch 'master' into patch-4 Erwan Leboucher 2017-04-07 12:43:56 +0200
  • e3a3422a65 Allow setting of default language through config Eugen Rochko 2017-04-07 12:40:26 +0200
  • 3fa8505769 Merge branch 'master' into skylight Eugen Rochko 2017-04-07 12:25:10 +0200
  • 624a9a7136 Re-add forgotten <author> element on standalone <entry> Eugen Rochko 2017-04-07 12:21:00 +0200
  • f0397825a5 Merge branch 'master' into witchesTown Alda Marteau-Hardi 2017-04-07 11:58:04 +0200
  • 011bcbf21f Merge branch 'feature-ox-fix' into skylight Eugen Rochko 2017-04-07 11:09:29 +0200
  • 1c351709bc Force UTF8 encoding on generated XML (#1140) Eugen 2017-04-07 11:09:14 +0200
  • 6164662e1f Force UTF8 encoding on generated XML Eugen Rochko 2017-04-07 11:05:36 +0200
  • b38c43c398 Fixed two translation errors Sebastian Hübner 2017-04-07 11:04:45 +0200
  • 8e7d0bda40 Update List-of-Mastodon-instances.md Sergei Č 2017-04-07 11:54:41 +0300
  • f43135f846 Merge branch 'master' into witchesTown Alda Marteau-Hardi 2017-04-07 08:51:43 +0200
  • 1c12a87eb7 Performance tweak Alda Marteau-Hardi 2017-04-07 08:51:11 +0200
  • 1073d15781 Tweak a bit the witches style Alda Marteau-Hardi 2017-04-07 08:48:59 +0200
  • 8f0ff8c141 Accidentally removed a line MKody 2017-04-07 08:38:29 +0200
  • a5d0c97c19 Added supports directive to test filter: blur() MKody 2017-04-07 08:35:03 +0200
  • 36f86b183f Merge remote-tracking branch 'upstream/master' Jantso Porali 2017-04-07 07:43:54 +0200
  • ab6da9893e updated some minor typos Jantso Porali 2017-04-07 07:31:03 +0200
  • 2dc4309096 Add Corsican translation palindromordnilap 2017-04-07 07:23:53 +0200
  • dcd91b2431 Set columns in frontend to have fluid width Rachel 2017-04-07 02:10:31 +0000
  • 15be4bad25 fixed a typo Max von Webel 2017-04-06 21:05:40 -0700
  • ed4d2d8a69 Merge branch 'master' into skylight Eugen Rochko 2017-04-07 05:59:59 +0200
  • 6d6a429af8 Rewrite Atom generation from stream entries to use Ox instead of Nokogiri (#1124) Eugen 2017-04-07 05:56:56 +0200
  • 528ed6f80c All Salmon slaps now use Ox instead of Nokogiri. No touch from status on account Eugen Rochko 2017-04-07 05:42:40 +0200
  • 5d43a9cae2 Email service options :P Jason Rhodes 2017-04-06 22:48:17 -0400
  • 40ef31397d Rewrite Atom generation from stream entries to use Ox instead of Nokogiri::Builder Eugen Rochko 2017-04-07 04:31:24 +0200
  • 7f1d232e65 (better) Better background-photo.jpeg Komic 2017-04-07 02:46:20 +0200
  • 8a4ff30ceb updated instance hostname Tristan Mahé 2017-04-06 17:18:40 -0700
  • cd4b947aa6 ...Don't comment please. Dolf RATTMANN 2017-04-07 01:38:01 +0200
  • 56f4a94e7b Update Production-guide.md Vladimir Mincev 2017-04-07 01:05:32 +0200
  • 3b91778a5f Update docker-compose.yml Pierre Ozoux 2017-04-06 23:54:31 +0100
  • f7decf62ff Fixed Typo in "General dependencies" Melon Bread 2017-04-06 18:38:37 -0400
  • 46c3e5185b Use image too in docker-compose Pierre Ozoux 2017-04-06 23:30:17 +0100
  • e8ab25e48b Merge branch 'master' into master palindromordnilap 2017-04-07 00:15:41 +0200
  • 453c15ab76 Merge branch 'master' into skylight Eugen Rochko 2017-04-07 00:06:58 +0200
  • 162f4492d0 Production-guide.md:Extend webserver configuration Florian Knodt 2017-04-07 00:06:06 +0200
  • 31597fd377 Low-hanging fruit of query optimization, these indices were missing Eugen Rochko 2017-04-07 00:04:09 +0200
  • 2a809bd6d9 Nevermind, I opened up subscriptions Dolf RATTMANN 2017-04-07 00:03:46 +0200
  • 4b08b7c502 Added masto.razrnet.fr YDrogen 2017-04-06 23:59:56 +0200
  • 49209810d3 Better background-photo.jpeg Komic 2017-04-06 23:56:53 +0200
  • 185eadd167 Add Corsican translation palindromordnilap 2017-04-06 23:40:42 +0200
  • 0cb2b0c07f Add Corsican translation palindromordnilap 2017-04-06 23:39:44 +0200
  • da737c538a Add Corsican translation palindromordnilap 2017-04-06 23:38:51 +0200
  • bfd3022d37 Add Corsican translation palindromordnilap 2017-04-06 23:37:33 +0200
  • 48d5db7203 Add Corsican translation palindromordnilap 2017-04-06 23:36:18 +0200
  • 7dffba3f88 Adding Corsican translation palindromordnilap 2017-04-06 23:34:36 +0200
  • 019f42dcdd Merge branch 'master' of github.com:foozmeat/mastodon James Moore 2017-04-06 14:33:34 -0700
  • 8527deb428 Adding Corsican translation palindromordnilap 2017-04-06 23:33:22 +0200
  • 144f0db78f switch development redis config to match style of production James Moore 2017-04-05 20:32:41 -0700
  • 8cb7d157bd Merge pull request #1100 from mjankowski/mj-reduce-image-size Eugen 2017-04-06 22:59:48 +0200
  • acf10a2c87 Merge pull request #1103 from alimony/vagrant-tweaks-01 Eugen 2017-04-06 22:58:44 +0200
  • 072f9771f5 Merge branch 'master' into background-profiles Kody 2017-04-06 22:52:29 +0200
  • 7596de1aec Add a couple of network performance tweaks to Vagrantfile. Markus Amalthea Magnuson 2017-04-06 22:34:59 +0200
  • d246a75187 Add titles to more icons, and change clear notifications icon. Markus Amalthea Magnuson 2017-04-06 22:30:41 +0200
  • 97ae53daa8 Reduce size of background-photo.jpeg Matt Jankowski 2017-04-06 16:24:57 -0400
  • 9cfa0e8751 Updating the Apache configuration sample Komic 2017-04-06 21:59:47 +0200
  • cd77c75d6c Merge pull request #1088 from Wonderfall/master Eugen 2017-04-06 21:35:10 +0200
  • 3b1f903e52 Update simple_form.en.yml Braxton Fair 2017-04-06 14:05:59 -0500
  • cfbd90cf44 Added pericles.world in the list of instances Tristan Mahé 2017-04-06 12:05:37 -0700
  • bb60af1542 Change from British to American way Braxton Fair 2017-04-06 14:03:41 -0500
  • ed2bfdee67
    add Docker microbadger to README.md Wonderfall 2017-04-06 20:59:20 +0200
  • a3318814e1
    add metadata to Dockerfile Wonderfall 2017-04-06 20:57:16 +0200
  • cfca9e8e8e Update en.jsx Adrian 2017-04-06 21:55:26 +0300
  • 2dc2003b99 Disable prepared_statements in production to allow use of pgbouncer Eugen Rochko 2017-04-06 20:50:13 +0200
  • 4d1217d8f9 Merge branch 'master' into skylight Eugen Rochko 2017-04-06 20:50:05 +0200
  • acf6436a99 Add manx.social instance isati 2017-04-06 19:31:25 +0100
  • 57e7cc68e4 add dot and fix typo Jantso Porali 2017-04-06 20:26:41 +0200
  • 329464f8d2 add finnish translation for emails Jantso Porali 2017-04-06 20:26:26 +0200
  • 17ca433ced update finnish language to emails Jantso Porali 2017-04-06 20:25:27 +0200