Commit Graph

  • 62aa38be9c Merge 9a248ecbb0 into 0611209141 mshrtkch 2017-04-16 13:25:24 +0000
  • ee54ebe95b Add missing Japanese translations Kazuhiro NISHIYAMA 2017-04-16 22:23:53 +0900
  • 6661c1b0ac Merge branch 'master' of https://github.com/tootsuite/mastodon Alex McGivern 2017-04-16 14:18:02 +0100
  • 9a248ecbb0 Fix ja mshrtkch 2017-04-16 22:15:08 +0900
  • 92a46f538b Change font size of select. ikasoumen 2017-04-16 22:04:33 +0900
  • 274b3db6bc Add flex property to fit labels to devise width. ikasoumen 2017-04-16 22:00:08 +0900
  • 26b490ca5f Merge remote-tracking branch 'tootsuite/master' mshrtkch 2017-04-16 22:01:41 +0900
  • 0611209141 Relax Ruby version requirement (#1901) Akihiko Odaki 2017-04-16 21:57:30 +0900
  • da302a43cd Improve PT locale on simple_form (#1917) Eduardo Elias 2017-04-16 13:56:04 +0100
  • 8f8319852c Fixed NoMethodError in UnfollowService (#1918) alpaca-tc 2017-04-16 21:55:43 +0900
  • 75f416a492 Fix yaml issue in ja locale (#1916) Matt Jankowski 2017-04-16 08:55:04 -0400
  • 24baaa17e8 Syntax error in japanese localisation (#1920) Naouak 2017-04-16 14:54:09 +0200
  • 0362ac7e3d Relax Ruby version requirement Akihiko Odaki 2017-04-16 15:30:27 +0900
  • c2bf5c8189 Syntax error in japanese localisation Naouak 2017-04-16 14:40:08 +0200
  • 0347f07f22 Use radio buttons in user setting page. ikasoumen 2017-04-16 21:34:09 +0900
  • b2e51182b3 Add missing keys to PT locale Eduardo Elias 2017-04-16 13:31:18 +0100
  • 7a3e2f2eae Improve PT locale on simple_form Eduardo Elias 2017-04-16 13:02:58 +0100
  • 70b76aa570 Fixed NoMethodError in UnfollowService alpaca-tc 2017-04-16 21:31:01 +0900
  • 449c823b16 Add “-webkit-overflow-scrolling: touch;” to enable smooth scroll on mobile safari and other webkit browsers. ikasoumen 2017-04-16 21:22:48 +0900
  • 7926820a5c Remove overflow because it blocks scrolling on mobile safari. ikasoumen 2017-04-16 21:20:45 +0900
  • c99fc08a0d Add missing french translation. (#1906) Erwan Leboucher 2017-04-16 14:15:03 +0200
  • a8f45c0838 Enlarge font size to avoid autozooming of iPhone. (#1911) Yuki Nakagawa 2017-04-16 21:05:16 +0900
  • e89843ebbd Merge branch 'master' of https://github.com/tootsuite/mastodon Alex McGivern 2017-04-16 13:04:47 +0100
  • e723d2e01e Fix issue in locales/ja.jsx Matt Jankowski 2017-04-16 07:52:01 -0400
  • d900c8ad1c Fix yaml parse issue in ja.yml locale Matt Jankowski 2017-04-16 07:47:11 -0400
  • 6e4f2b7086 Merge remote-tracking branch 'tootsuite/master' mshrtkch 2017-04-16 20:46:05 +0900
  • 6df63465b9 Improve Japanese translation (#1909) George Hattori 2017-04-16 20:44:57 +0900
  • 13b11ddc8c Add binstub for rspec from rspec-core (#1913) Matt Jankowski 2017-04-16 07:42:45 -0400
  • f2997c9715 Update Japanese Translate (#1903) 新都心(Neet Shin) 2017-04-16 17:12:16 +0530
  • f0fff313a3 Add support for SMTP_CA_FILE Joachim Viide 2017-04-14 20:50:37 +0300
  • 110ad552bd Fix ja mshrtkch 2017-04-16 20:31:47 +0900
  • 1491c35683 Add the licence key in package.json Alda Marteau-Hardi 2017-04-16 13:26:54 +0200
  • 33408d7a2a Add binstub for rspec from rspec-core Matt Jankowski 2017-04-16 07:25:02 -0400
  • f824b30cfa Merge cc11b4a156 into e17f9d5e1a Yamagishi Kazutoshi 2017-04-16 10:55:30 +0000
  • e17f9d5e1a Unite all mandatory rake tasks in mastodon:daily (#1887) Eugen 2017-04-16 12:53:58 +0200
  • a3151bac2a Fix typo in task description Eugen 2017-04-16 12:53:46 +0200
  • 865cb39e9b lock capistrano to 3.8.0 (#1890) Alex Dunn 2017-04-16 03:52:18 -0700
  • 5d710b1139 Make file attachment on MediaAttachment optional (#1865) Eugen 2017-04-16 12:51:30 +0200
  • bad675122c Update mastodon.jsx ButterflyOfFire 2017-04-16 11:47:28 +0100
  • ca5648863d Update mastodon.jsx ButterflyOfFire 2017-04-16 11:45:40 +0100
  • 78b823241b Update mastodon.jsx ButterflyOfFire 2017-04-16 11:40:54 +0100
  • dea0613589 Merge 146d20807e into 8a58942c80 ButterflyOfFire 2017-04-16 10:13:07 +0000
  • 146d20807e Update ar.yml ButterflyOfFire 2017-04-16 11:13:05 +0100
  • 08c5094ceb Enlarge font size to avoid autozooming of iPhone. ikasoumen 2017-04-16 19:12:04 +0900
  • a4aaea4463 Update fr.jsx Erwan Leboucher 2017-04-16 11:46:50 +0200
  • af842c60a7 Improve Japanese translation hattori6789 2017-04-16 18:03:43 +0900
  • 123864af0e reduce unneed query when post without attachements. Keiji Yoshimi 2017-04-16 17:27:11 +0900
  • ccd1b97a0c Add missing french translation. Erwan Leboucher 2017-04-16 10:33:44 +0200
  • 41334f6cac Update ja.jsx 新都心(Neet Shin) 2017-04-16 13:45:49 +0530
  • 5c97653215 [Update ja] Added Two-fact/Recovery's translation 新都心(Neet Shin) 2017-04-16 13:41:42 +0530
  • 106c272762 [Update ja] Added Recovery code's translation 新都心(Neet Shin) 2017-04-16 13:35:00 +0530
  • 4580547e07 [Update ja.jsx] Add Muted, Video_error and sorted 新都心(Neet Shin) 2017-04-16 13:02:50 +0530
  • 298e6e25fa Update settings_helper.rb ButterflyOfFire 2017-04-16 08:09:45 +0100
  • 33378af8e5 Update index.jsx ButterflyOfFire 2017-04-16 08:08:08 +0100
  • 74c8626668 Update mastodon.jsx ButterflyOfFire 2017-04-16 07:55:16 +0100
  • 75b5ee2ccf Merge branch 'master' into ian-docs-smtp Effy Elden 2017-04-16 16:49:38 +1000
  • f7214b639f Update doorkeeper.ar.yml ButterflyOfFire 2017-04-16 07:47:48 +0100
  • d6446e24f7 Update simple_form.ar.yml ButterflyOfFire 2017-04-16 07:45:39 +0100
  • db345f3c10 Update ar.jsx ButterflyOfFire 2017-04-16 07:41:37 +0100
  • 21297b6d96 changed to unescape in reducer ABCanG 2017-04-16 15:21:48 +0900
  • 730d4a74e1 Merge branch 'master' into remove-dotkeep Effy Elden 2017-04-16 16:32:28 +1000
  • 5ca29c5bb2 Update application.rb ButterflyOfFire 2017-04-16 07:26:10 +0100
  • d0a2c8891f change to send raw content ABCanG 2017-04-16 03:18:28 +0900
  • fd81916e86 cache blockings for reducing queries. Keiji Yoshimi 2017-04-15 23:59:39 +0900
  • a5c6b1f6cd Added missing `rake secret` command Expenses 2017-04-16 14:49:20 +1200
  • a77854cf04 lock capistrano to 3.8.0 Alex Dunn 2017-04-15 18:49:09 -0700
  • cc11b4a156 Add Japanese translation for muted users Yamagishi Kazutoshi 2017-04-16 11:33:42 +0900
  • 8a58942c80 Fix up recovery codes design a little (#1866) Eugen 2017-04-16 04:32:57 +0200
  • 77b7b838d0 Remove .keep in models tackeyy 2017-04-16 11:25:39 +0900
  • 55c79709e0 Add missing propTypes Eugen 2017-04-16 04:09:51 +0200
  • f97272549c Remove unused gem: coffee-rails (#1885) luigi 2017-04-16 04:02:29 +0200
  • 363de2dffd Leave out the "Expires" header from S3 uploads (#1886) Joachim Viide 2017-04-16 05:01:58 +0300
  • 6a1ac9b31f capistrano: allow overriding repo_url and branch (#1889) Alex Dunn 2017-04-15 19:01:27 -0700
  • 14c662f498 capistrano: allow overriding repo_url and branch Alex Dunn 2017-04-15 18:45:33 -0700
  • 16d7a73a1f Merge branch 'master' into fix-recovery-codes-design Eugen 2017-04-16 03:43:12 +0200
  • 0b5909401c Merge branch 'master' into fix-1870 Eugen 2017-04-16 03:43:09 +0200
  • 5007167883 Merge branch 'master' into feature-onboarding Eugen 2017-04-16 03:43:06 +0200
  • aa8dd02485 Merge branch 'master' into chore/remove-coffeescript-gem Eugen 2017-04-16 03:43:01 +0200
  • 5ba2358b81 Merge branch 'master' into feature-more-rake-tasks Eugen 2017-04-16 03:42:58 +0200
  • e155691917 Merge branch 'master' into feature-improve-domain-blocks Eugen 2017-04-16 03:42:01 +0200
  • 3834e1e69b View spec fix (#1888) Matt Jankowski 2017-04-15 21:40:33 -0400
  • ba3d5e4f37 Fix naming in view specs Matt Jankowski 2017-04-15 21:22:46 -0400
  • 775e152198 Use show_landing_strip? helper in accounts and stream entries views Matt Jankowski 2017-04-15 21:21:36 -0400
  • 10639543a8 Add show_landing_strip? helper method Matt Jankowski 2017-04-15 21:20:54 -0400
  • d194515522 Add option to disable verify partial doubles Matt Jankowski 2017-04-15 21:19:59 -0400
  • 73b1082bde Unite all mandatory rake tasks in mastodon:daily Add mastodon:media:remove_remote task Make mastodon:maintenance:add_static_avatars more resilient to exceptions Eugen Rochko 2017-04-16 03:21:45 +0200
  • 25648017fb Leave out the "Expires" header from S3 uploads Joachim Viide 2017-04-16 04:18:04 +0300
  • 95bcbaa434 Fix #1852 - Ensure feeds have valid <title> tags (#1875) Eugen 2017-04-16 02:40:36 +0200
  • ce15f2bc63 Remove unused gem: coffee-rails luigi 2017-04-16 02:25:36 +0200
  • 3d92275e68 Merge branch 'master' into feature-onboarding Eugen 2017-04-16 02:00:31 +0200
  • c2216b00a9 Finishing touches on the onboarding Eugen Rochko 2017-04-16 01:52:26 +0200
  • 6f9bb23a06 Merge pull request #11 from tootsuite/master Hugo Gameiro 2017-04-16 00:14:24 +0100
  • 911338bdcc Show error message if video cannot be loaded (#1879) Isabelle Knott 2017-04-15 19:12:47 -0400
  • b1c714fd6e Fixes #1829 adds full-width toolbar Brian Mock 2017-04-15 16:04:08 -0700
  • a7bd2dd5b0 Ignore /vendor/bundle Marcin Cieślak 2017-04-15 22:32:13 +0000
  • 62ce0fd2fe Show error message if video cannot be loaded blackle 2017-04-15 18:18:49 -0400
  • 3466d79e64 /#1319 Specify local followers rather than all followers. Simon 2017-04-15 14:07:18 -0800
  • e1347a7f24 Expose version in API Allan Reyes 2017-04-14 02:48:12 -0700
  • 860e97537f Add .version file handling and Rake task Allan Reyes 2017-04-14 02:47:56 -0700
  • ef7a2baa5c Run yarn in bin/setup and bin/update Allan Reyes 2017-04-14 02:46:23 -0700