Commit Graph

  • a4e2db2c33 Update circle.yml to contain files under public/packs Tomoya Chiba 2017-05-31 00:54:07 +0900
  • 4c7fe48c40 Add "private: true" to package.json (#3441) Yamagishi Kazutoshi 2017-05-30 23:11:45 +0900
  • 8b10d13c34 Add "private: true" to package.json Yamagishi Kazutoshi 2017-05-30 22:49:20 +0900
  • 499cc7b803 Fix webpack building on Windows (#3426) Naouak 2017-05-30 15:30:59 +0200
  • 7db98aa70e Refactor User and spec (#3431) Akihiko Odaki 2017-05-30 22:28:56 +0900
  • e031fd60ad Move status reblog authorization into policy (#3425) Jack Jennings 2017-05-30 06:16:14 -0700
  • bc4fad9e22 Change libraries path to relative (#3433) Yamagishi Kazutoshi 2017-05-30 22:13:04 +0900
  • 5ac4d677e9 Remove unused React Storybook addon (#3434) Yamagishi Kazutoshi 2017-05-30 22:12:12 +0900
  • 0191a9d873 Merge branch 'master' into relative-path Yamagishi Kazutoshi 2017-05-30 22:12:00 +0900
  • b42bdd80e8 Extract polyfill loading into single module (#3421) Nolan Lawson 2017-05-30 06:11:15 -0700
  • 76fa9d2488 Use around hook to restore context in InstancePresenter spec (#3430) Akihiko Odaki 2017-05-30 22:03:35 +0900
  • 5eab9321f3 Merge 9c2a7467a7 into dfc43a6d3d aeonofdiscord 2017-05-30 10:46:56 +0000
  • dfc43a6d3d Use around hook to restore context in InstanceHelper spec (#3429) Akihiko Odaki 2017-05-30 19:32:33 +0900
  • 67bc58dd60 Use around hook to restore context in Admin::SettingsController spec (#3428) Akihiko Odaki 2017-05-30 19:32:09 +0900
  • 2d39560dc1 Use around hook to restore context in ApplicationHelper spec (#3432) Akihiko Odaki 2017-05-30 19:29:48 +0900
  • 40bd3b9385 delete old logo d6rkaiz 2017-05-30 17:15:37 +0900
  • d8d2cfaad8 mv logo image d6rkaiz 2017-05-30 17:14:27 +0900
  • e57b3adeec Merge branch 'qiitadon' of https://github.com/increments/mastodon into qiitadon-v1.4.1 Yamagishi Kazutoshi 2017-05-30 16:56:13 +0900
  • 7359c5a701 Remove unused React Storybook addon Yamagishi Kazutoshi 2017-05-30 16:37:25 +0900
  • d265ef7156 Change libraries path to relative Yamagishi Kazutoshi 2017-05-30 15:26:59 +0900
  • 1f7a423ce4 Merge pull request #45 from tomoasleep/fix-code-line-break Tomoya Chiba 2017-05-30 14:37:29 +0900
  • 997cc678ce Fix code highlighter not to delete line breaks for Firefox Tomoya Chiba 2017-05-30 14:35:08 +0900
  • db97149087 fix conflict d6rkaiz 2017-05-30 14:08:08 +0900
  • e82a63e7d1 Merge tag 'v1.4.1' into mstdnclub d6rkaiz 2017-05-30 14:03:34 +0900
  • f8d1cc99f0 add eslint-disable-line Nolan Lawson 2017-05-29 21:32:39 -0700
  • 8e5d0ddaf0 Merge 088d478cae into c49ff7395e Yann GUERN 2017-05-30 03:26:14 +0000
  • 96ff5053a3 Improve spec for User Akihiko Odaki 2017-05-30 12:05:27 +0900
  • 7fa71772d3 Protect send_devise_notification of User Akihiko Odaki 2017-05-30 10:19:55 +0900
  • bee57ec3b5 Merge pull request #42 from tomoasleep/do-not-use-pre-tag-for-code Tomoya Chiba 2017-05-30 10:45:44 +0900
  • 39f1e03531 Use around hook to restore context in InstancePresenter spec Akihiko Odaki 2017-05-30 10:24:52 +0900
  • 7dd17a4db4 Use around hook to restore context in InstanceHelper spec Akihiko Odaki 2017-05-30 10:16:06 +0900
  • dee569cea9 Use around hook to restore context in ApplicationHelper spec Akihiko Odaki 2017-05-30 10:15:28 +0900
  • 43c945f264 Use around hook to restore context in Admin::SettingsController spec Akihiko Odaki 2017-05-30 10:13:52 +0900
  • c49ff7395e Run bundle command (follow up #3403) (#3427) Yamagishi Kazutoshi 2017-05-30 10:04:44 +0900
  • 06c06eb463 Run bundle command (follow up #3403) Yamagishi Kazutoshi 2017-05-30 10:03:42 +0900
  • aebd495906 Fix highlighter to append hljs class to code tags even though unsupported syntax is given Tomoya Chiba 2017-05-29 23:32:19 +0900
  • e292f9a08d Modify CodeBlockFormatter not to use pre tag Tomoya Chiba 2017-05-29 22:52:36 +0900
  • ee60b51279 Cover Auth::RegistrationsController more Akihiko Odaki 2017-05-27 15:23:13 +0900
  • 4070c7c5c1 Fix my own stupidity. I forgot to check outside my test script the regexp... Naouak 2017-05-30 01:11:43 +0200
  • ba36fa8a44 Fix regexp. Naouak 2017-05-30 01:09:03 +0200
  • ccf8897ffe Path should not be constructed manually. Use path.join to ensure compatibility. Naouak 2017-05-30 00:53:36 +0200
  • c8e7c6ca6b Path should not be constructed manually. Use path.join to ensure compatibility. Naouak 2017-05-30 00:41:20 +0200
  • 5626d64606 Move status reblog authorization into policy Jack Jennings 2017-05-29 12:53:27 -0700
  • 1bdca0009d Merge branch 'master' into application-prefs-section Colin Mitchell 2017-05-29 14:45:09 -0400
  • b5d5663c8b Remove react-imageloader Nolan Lawson 2017-05-29 11:15:39 -0700
  • 691f888a2a Merge v1.4.1 into application-prefs-section Colin Mitchell 2017-05-29 14:27:39 -0400
  • f3bd8cdbdb Add code for creating/managing apps to settings section Colin Mitchell 2017-05-01 15:24:12 -0400
  • 65be381c7a Use "source-map" in development mode Nolan Lawson 2017-05-29 10:42:37 -0700
  • ac386afa4f Merge branch 'master' into push_update_only_for_current_active_users Clworld 2017-05-30 01:34:39 +0900
  • 4813fc8b55 Extract polyfill loading into single module Nolan Lawson 2017-05-29 09:32:02 -0700
  • e0ada97770 Update dependencies of Node.js (#3067) Yamagishi Kazutoshi 2017-05-30 01:23:28 +0900
  • 3a2003ba86 Extract authorization policy for viewing statuses (#3150) Jack Jennings 2017-05-29 09:22:22 -0700
  • 9a81be0d37 [RFC] Return 401 for an authentication error on WebSockets (#3411) unarist 2017-05-30 01:20:53 +0900
  • 5e2c5e95b6 Version bumps for non-rails gems (#3398) Matt Jankowski 2017-05-29 12:18:06 -0400
  • 34a93ccf57 Add IntersectionObserverWrapper to cut down on re-renders (#3406) Nolan Lawson 2017-05-29 09:17:51 -0700
  • 922fb74197 Remove methods from ObfuscateFilename and spec (#3347) Akihiko Odaki 2017-05-30 01:14:16 +0900
  • 7bf2d6cb06 Spec Auth::ConfirmationsController (#3348) Akihiko Odaki 2017-05-30 01:13:11 +0900
  • 11e5c965c3 Spec AccountControllerConcern (#3349) Akihiko Odaki 2017-05-30 01:12:54 +0900
  • 34157d118c Cover Admin::ReportsController more (#3346) Akihiko Odaki 2017-05-30 01:12:34 +0900
  • 7b92950f1c Cover InstancesController more (#3342) Akihiko Odaki 2017-05-30 01:12:17 +0900
  • 97d7028c31 Cover Admin::SuspensionsController more (#3350) Akihiko Odaki 2017-05-30 01:11:16 +0900
  • a7f2961621 Spec Auth::PasswordsController (#3352) Akihiko Odaki 2017-05-30 01:10:50 +0900
  • 00dda99789 Spec Admin::ResetsController calls send_reset_password_instructions (#3354) Akihiko Odaki 2017-05-30 01:09:17 +0900
  • 2e27ce3b61 Spec #destroy feature of Admin::TwoFactorAuthenticationsController (#3355) Akihiko Odaki 2017-05-30 01:08:58 +0900
  • 2c10c5a069 Coever Admin::SilencesController more (#3356) Akihiko Odaki 2017-05-30 01:08:42 +0900
  • bd4dd4c4a0 Cover Settings::ExportsController more (#3358) Akihiko Odaki 2017-05-30 01:08:26 +0900
  • 7d33b60f3f Cover Oauth::AuthorizedApplicationsController (#3359) Akihiko Odaki 2017-05-30 01:08:05 +0900
  • aecce5694b Cover Oauth::AuthorizationsController more (#3361) Akihiko Odaki 2017-05-30 01:07:39 +0900
  • 0e4ca51951 Cover Settings::TwoFactorAuthenticationsController more (#3376) Akihiko Odaki 2017-05-30 01:07:07 +0900
  • dde043f6cd Cover WellKnown::HostMetaController more (#3382) Akihiko Odaki 2017-05-30 01:05:30 +0900
  • c778a60e4f Cover Settings::TwoFactorAuthentication::RecoveryCodesController more (#3383) Akihiko Odaki 2017-05-30 01:05:20 +0900
  • c347327d54 Spec Settings::Exports (#3384) Akihiko Odaki 2017-05-30 01:05:01 +0900
  • fd328cf6e8 Cover WellKnown::WebfingerController more (#3385) Akihiko Odaki 2017-05-30 01:04:37 +0900
  • 7b473d7514 Cover Settings::TwoFactorAuthentication::ConfirmationsController more (#3386) Akihiko Odaki 2017-05-30 01:04:00 +0900
  • dff576b75d Cover ApplicationHelper more (#3412) Akihiko Odaki 2017-05-30 01:03:37 +0900
  • 52ae83d008 Spec Activitystreams2BuilderHelper (#3413) Akihiko Odaki 2017-05-30 01:03:15 +0900
  • 5aacd9d4c7 Spec FlashesHelper (#3414) Akihiko Odaki 2017-05-30 01:03:02 +0900
  • d24d3fa283 Spec HomeHelper (#3415) Akihiko Odaki 2017-05-30 01:02:44 +0900
  • c8a226f61c Spec HttpHelper (#3416) Akihiko Odaki 2017-05-30 01:02:32 +0900
  • 83ac83dba2 delete debug log narabo 2017-05-30 01:01:47 +0900
  • 7a281c477a Cover Admin::PubSubHubHubController more (#3343) Akihiko Odaki 2017-05-30 01:01:37 +0900
  • 91c789ec63 Don't stream toots from users who have blocked the recipient user (#3300) unarist 2017-05-30 01:01:08 +0900
  • 9ead3d1cdb [nanobox] Adjustments for Nanobox development (#3295) Daniel Hunsaker 2017-05-29 09:59:18 -0600
  • 402c19a924 Add preference setting for delete toot modal (#3368) Atsushi Yamamoto 2017-05-29 11:56:13 -0400
  • 7062f5ca42 Merge 4ad2154a19 into b5e8994844 Akihiko Odaki 2017-05-29 15:53:48 +0000
  • b5e8994844 Prevent wasted render in load_more.js (#3402) Nolan Lawson 2017-05-29 08:52:45 -0700
  • 4bd327a0c5 fix-rails-minor-version (#3403) masarakki 2017-05-30 00:52:26 +0900
  • 184325077e l10n: Fix Japanese translation (#3410) lindwurm 2017-05-30 00:52:02 +0900
  • 8236f942ff Use travis_retry to reduce spurious test failures (#3418) Nolan Lawson 2017-05-29 08:49:54 -0700
  • 0c4e2c003a Use travis_retry to reduce spurious test failures Nolan Lawson 2017-05-29 08:17:58 -0700
  • da033aa0e2 merge production narabo 2017-05-29 23:35:49 +0900
  • 676d96d2a4 Merge branch 'qiitadon' of https://github.com/increments/mastodon into qiitadon-v1.4.1 Yamagishi Kazutoshi 2017-05-29 23:31:11 +0900
  • 220e8c0e72 Merge tag 'v1.4.1' of https://github.com/tootsuite/mastodon into qiitadon Yamagishi Kazutoshi 2017-05-29 20:34:05 +0900
  • 6f882553c7 Merge pull request #41 from ykzts/for-each Tomoya Chiba 2017-05-29 23:20:33 +0900
  • a7bf97019d Use upgradeReq instead of a custom object unarist 2017-05-29 23:03:52 +0900
  • 968e5e61ca Cover ApplicationHelper more Akihiko Odaki 2017-05-29 21:08:23 +0900
  • f15f22cdbd Does not use NodeList.prototype.forEach Yamagishi Kazutoshi 2017-05-29 22:14:57 +0900
  • 154a2d909f Spec Activitystreams2BuilderHelper Akihiko Odaki 2017-05-29 20:39:47 +0900
  • 458b4f2d35 Spec FlashesHelper Akihiko Odaki 2017-05-29 21:18:17 +0900
  • c8dfbceec0 Spec HttpHelper Akihiko Odaki 2017-05-29 22:00:50 +0900