Commit Graph

  • 7b7bff04df Merge branch 'master' into master Shel R 2017-04-07 21:54:32 -0400
  • e659608797 Merge pull request #970 from estuans/patch-1 Shel R 2017-04-07 21:49:57 -0400
  • ed332693fe Merge branch 'master' into patch-1 Shel R 2017-04-07 21:49:18 -0400
  • 881e4277fd Merge pull request #969 from Fortyseven/patch-1 Shel R 2017-04-07 21:48:58 -0400
  • 5dfc9854f1 Merge branch 'master' into patch-1 Shel R 2017-04-07 21:48:19 -0400
  • b300bb3b4e Merge pull request #959 from mkody/patch-1 Shel R 2017-04-07 21:45:06 -0400
  • 6d519e6fd1 Merge branch 'master' into patch-1 Shel R 2017-04-07 21:44:16 -0400
  • d2c9cc31de Merge pull request #953 from Technowix/patch-1 Shel R 2017-04-07 21:43:20 -0400
  • 065defefac Merge branch 'master' into patch-1 Shel R 2017-04-07 21:42:10 -0400
  • 6bfe068904 Merge pull request #944 from VirtuBox/patch-1 Shel R 2017-04-07 21:35:34 -0400
  • bc237d17a7 Merge branch 'master' into patch-1 Shel R 2017-04-07 21:34:41 -0400
  • 375b7afe72 Merge b7b2ef3501 into 67999f0a5b François REMY 2017-04-08 01:28:48 +0000
  • 67999f0a5b Merge pull request #806 from azillion1/patch-1 Shel R 2017-04-07 21:28:46 -0400
  • 485d75a805 #1141 on remote follow Yann GUERN 2017-04-08 03:24:35 +0200
  • d739bde556 Use site_title value for og:site_name Matt Jankowski 2017-04-07 16:00:34 -0400
  • c5945cfdb3 Use site_title helper in application layout Matt Jankowski 2017-04-07 16:00:18 -0400
  • dc514e7305 Add helper method to return Setting.site_title Matt Jankowski 2017-04-07 15:58:34 -0400
  • 3dba0c1486 tabs Alex McGivern 2017-04-08 02:13:06 +0100
  • debeedf917 Added max_users setting to block new registrations when the instance is full Alex McGivern 2017-04-08 02:09:55 +0100
  • 4b621188ad Fix #1165 - before_action was called before protect_from_forgery Eugen Rochko 2017-04-08 02:30:50 +0200
  • c85eb0a024 Fix #1141, fix #1126 - Work through UpdateRemoteProfileService for both <feed> and <entry> top-level tags Eugen Rochko 2017-04-08 02:06:09 +0200
  • 2f493cbd74 Merge e128a4caef into a872f2f4c6 Thibaut (Eychics) 2017-04-07 23:48:55 +0000
  • 4fb24a70d3 Merge branch 'master' into patch-1 David Huerta 2017-04-07 19:46:07 -0400
  • b2a7218ab7 Fix #801 - Respect webfinger's canonical response of username/domain Eugen Rochko 2017-04-08 01:07:42 +0200
  • fef76179b6 Merge 9e7a67560b into a872f2f4c6 svanneste 2017-04-07 23:06:26 +0000
  • c0bddd7962 Merge e8ab25e48b into a872f2f4c6 palindromordnilap 2017-04-07 23:06:26 +0000
  • 57595f0996 Merge 2dc4309096 into a872f2f4c6 palindromordnilap 2017-04-07 23:06:26 +0000
  • ad27b17f13 Merge 7e6766424a into a872f2f4c6 kadiix 2017-04-07 23:04:00 +0000
  • a872f2f4c6 Merge pull request #1204 from benklop/patch-1 Eugen 2017-04-08 01:00:32 +0200
  • 32a6f0884c Merge pull request #1200 from huertanix/patch-2 Eugen 2017-04-08 01:00:06 +0200
  • a54af44975 Merge pull request #1210 from raymestalez/patch-3 Eugen 2017-04-08 00:59:02 +0200
  • f113af5350 Add HackerNewsBot Ray Alez 2017-04-07 15:56:02 -0700
  • f578cf8331 Update Administration-guide.md benklop 2017-04-07 16:31:50 -0600
  • 3cb13bdd84 Merge pull request #1125 from jasonrhodes/patch-1 Eugen 2017-04-08 00:24:38 +0200
  • 0bf31f5436 Merge pull request #1147 from fmauNeko/docker_smaller_image Eugen 2017-04-07 23:45:48 +0200
  • a7ab2204d4 Update Heroku-guide.md David Huerta 2017-04-07 17:44:32 -0400
  • 36a83cc4f9 Update Heroku-guide.md David Huerta 2017-04-07 17:29:21 -0400
  • 30903d5f02 Add indigo.zone to list of instances Blake 2017-04-07 14:10:37 -0700
  • 94536af96d Adds Oulipo.social to Mastodons list Mouse Reeve 2017-04-07 14:06:49 -0700
  • 0b32b5108e Merge pull request #1191 from d3vgru/master Eugen 2017-04-07 23:02:49 +0200
  • 12f1cdeed1
    Fix npm/yarn cache cleaning Florian Maunier 2017-04-07 13:31:18 +0200
  • ae7ac56b4f Merge ab1ce9c019 into e2f024147c Angristan 2017-04-07 20:51:44 +0000
  • e2f024147c Merge pull request #1172 from mjankowski/mj-heroku-docs Eugen 2017-04-07 22:50:31 +0200
  • 1961825ff9 Merge pull request #1183 from thoughtbot/cp-post-status-service-specs Eugen 2017-04-07 22:30:28 +0200
  • 32748c0f71 Merge pull request #1184 from thoughtbot/extract-proper-status Eugen 2017-04-07 22:28:15 +0200
  • acce4ca64f Merge 38bec79811 into 37a36b0bec Chad Pytel 2017-04-07 20:26:32 +0000
  • 37a36b0bec Merge pull request #1192 from seekr/patch-2 Eugen 2017-04-07 22:25:48 +0200
  • c7d9b81d41 Merge pull request #1193 from thoughtbot/status-specs Eugen 2017-04-07 22:25:10 +0200
  • 4fdeac21f4 Implement pending specs on Status Joël Quenneville 2017-04-07 15:30:36 -0400
  • 131f505fd0 typo seekr 2017-04-07 16:33:13 -0300
  • 27012aaeb6 change suggested cipher for nginx Ed Knutson 2017-04-07 14:10:39 -0500
  • aa14fe49fe Update simple_form.fr.yml Olivier Humbert 2017-04-07 20:37:26 +0200
  • 94c671c41d Update fr.yml Olivier Humbert 2017-04-07 20:34:38 +0200
  • 4c751d25e5 Add mastodon.fun Aguay-val 2017-04-07 20:33:52 +0200
  • ad5ddd5e95 Use I18n for media attachment validation errors Chad Pytel 2017-04-07 14:19:16 -0400
  • 13c0077003 Add specs for PostStatusService Chad Pytel 2017-04-07 13:48:38 -0400
  • d4c94fa004 DRY up reblog vs original status check Joël Quenneville 2017-04-07 14:18:30 -0400
  • 38bec79811 Add specs for media attachment validations Chad Pytel 2017-04-07 12:50:43 -0400
  • 0f4fa59812 Update heroku instructions Matt Jankowski 2017-04-07 11:34:10 -0400
  • 1e614cacc1 Merge remote-tracking branch 'refs/remotes/tootsuite/master' Jantso Porali 2017-04-07 17:32:02 +0200
  • ba757b8452 updated about page translation Jantso Porali 2017-04-07 17:26:52 +0200
  • e77af86f73 Install Yarn dependencies during setup Joël Quenneville 2017-04-07 11:11:54 -0400
  • 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