Commit Graph

  • 539e6043ab Merge tag 'v1.3.1' into localize-kabutodon root 2017-04-29 04:17:33 +0900
  • 7ce7a872b0 Merge branch 'master' into piwik_support Tristan Mahé 2017-04-28 11:26:13 -0700
  • f0e89a7d8a Update of oc.jsx Quent-in 2017-04-28 20:14:04 +0200
  • 935c36d430 resolve conflict Tristan Mahé 2017-04-28 11:01:51 -0700
  • e220cd5cd8 Merge a547ea7e7c into a823509b99 Peranikov 2017-04-28 17:53:56 +0000
  • a19edc8f30 Changement de « muets » en « silencés » Sylvhem 2017-04-28 19:44:50 +0200
  • 1dc3e7538a Add @mjankowski's suggestions. * Moves destroy actions behind User#disable_two_factor! * Adds spec coverage for Admin:TwoFactorAuthenticationsController and User#disable_two_factor! Kaylee 2017-04-28 18:36:39 +0100
  • b6a87f049c Width Fix YaQ00 2017-04-29 02:14:54 +0900
  • 09d57b3c94 Width remove YaQ00 2017-04-29 01:38:12 +0900
  • 75e99b9ae7 Conflict YaQ00 2017-04-29 01:23:41 +0900
  • a104368f7c Upload Width Fix YaQ00 2017-04-29 01:10:44 +0900
  • 4198971677 Use PostgreSQL inheritance for blocks and mutes Akihiko Odaki 2017-04-27 14:17:20 +0900
  • 26afda93e5 Delete components.scss YaQ00 2017-04-29 01:07:48 +0900
  • 1de535ce5d Merge 952e9bf9bd into a823509b99 YaQ00 2017-04-28 16:04:30 +0000
  • a823509b99 Fix broken view spec for about/links (#2591) Matt Jankowski 2017-04-28 11:54:03 -0400
  • 298d28af51 Fix API for Mastodon version (#2590) Yamagishi Kazutoshi 2017-04-29 00:53:37 +0900
  • 0e5225730f Fix broken view spec for about/links Matt Jankowski 2017-04-28 11:52:47 -0400
  • 49e8d28d28 Fix API for Mastodon version Yamagishi Kazutoshi 2017-04-29 00:42:46 +0900
  • 653b394c25 Add option to disable two factor auth in admin accounts panel. Closes #2578 Kaylee 2017-04-28 14:28:19 +0100
  • 439b2dceda Minor updates to zh-CN JS translation (#2557) Mingye Wang 2017-04-28 10:45:41 -0400
  • 9262f6968b Fix broken spec for about/links view partial (#2586) Matt Jankowski 2017-04-28 10:45:24 -0400
  • 71e73e36cd Fix spec for hide get started (#2585) Yamagishi Kazutoshi 2017-04-28 23:44:57 +0900
  • 319e933008 Fix broken spec for about/links view partial Matt Jankowski 2017-04-28 10:21:37 -0400
  • 3fccbcd0ca Fix spec for hide get started Yamagishi Kazutoshi 2017-04-28 23:02:09 +0900
  • 984fa21f08 Merge pull request #3 from tomoasleep/code-block Tomoya Chiba 2017-04-28 22:53:28 +0900
  • 01c206326f Hide get started link when register closed (#2583) Yamagishi Kazutoshi 2017-04-28 22:45:37 +0900
  • 200ad3c0d7 Modify assets settings Shinpei Kawahito 2017-04-28 22:42:57 +0900
  • 50a30a875c Highlight code Tomoya Chiba 2017-04-28 20:37:05 +0900
  • 5e2bc4fed4 Support code block Tomoya Chiba 2017-04-28 20:36:47 +0900
  • 3c62f0b340 Hide get started link when register closed Yamagishi Kazutoshi 2017-04-28 22:23:14 +0900
  • 9566893cc9 More controller specs (#2561) Matt Jankowski 2017-04-28 09:12:37 -0400
  • 0e2589867f Update en locale federation description (#2558) Wonderfall 2017-04-28 15:11:54 +0200
  • 4acc386dd5 Update Russian translation (pluralizations) (#2565) Ratmir Karabut 2017-04-28 16:11:36 +0300
  • 429480bb77 Return missing page when tag does not exist (#2563) Matt Jankowski 2017-04-28 09:11:21 -0400
  • 61067dc2e6 Gem version updates (#2566) Matt Jankowski 2017-04-28 09:10:58 -0400
  • effb08edbb More status specs (#2564) Matt Jankowski 2017-04-28 09:10:41 -0400
  • d1b4ebe07d Update Russian translation (#2570) Ratmir Karabut 2017-04-28 16:08:23 +0300
  • 5eef9dab80 Update version to 1.3.1 (#2571) Ash Furrow 2017-04-28 15:07:48 +0200
  • 2ca246d7d1 Use the new Ruby 1.9 hash syntax (#2577) y-temp4 2017-04-28 22:07:16 +0900
  • 4b832b6ca0 Merge branch 'fusion-variables' into css-variables Anne Kozlika 2017-04-28 14:58:53 +0200
  • c13a22cbdc Merge pull request #1 from Nanashia/patch-1 maa123 2017-04-28 21:04:22 +0900
  • 6830f0b29a clean image when loggued. Valentin Ouvrard 2017-04-28 21:21:58 +1100
  • a6355495cc Use the new Ruby 1.9 hash syntax y-temp4 2017-04-28 18:44:11 +0900
  • d26bd84f66 make release 3.1 stable. Valentin Ouvrard 2017-04-28 20:42:12 +1100
  • 2c3ba1a964 SITEID in url when noscript Tristan Mahé 2017-04-28 01:47:33 -0700
  • 9588867b15 remove the no tracking from the about page if piwik is enabled Tristan Mahé 2017-04-28 01:10:08 -0700
  • b82f401563 Merge pull request #2 from tomoasleep/use-v1.3.1 Tomoya Chiba 2017-04-28 16:52:45 +0900
  • 4b2c80bfd4 Update version to 1.3.1 Ash Furrow 2017-04-28 08:48:14 +0200
  • 2304fdbb44 rubocop ... Tristan Mahé 2017-04-27 23:27:00 -0700
  • 145dfd6960 cleanup end Tristan Mahé 2017-04-27 23:22:31 -0700
  • efdd4653bb cleanup Tristan Mahé 2017-04-27 23:19:35 -0700
  • c6f4873aad clean a bit Tristan Mahé 2017-04-27 23:15:05 -0700
  • 8eb67b6051 Update Russian translation Ratmir Karabut 2017-04-28 07:48:40 +0300
  • 2759f2f001 jslint be happy Tristan Mahé 2017-04-27 21:21:38 -0700
  • 18163c1f82 rubocop i'm after you Tristan Mahé 2017-04-27 21:01:17 -0700
  • 4837d42e43 no space in arrays Tristan Mahé 2017-04-27 20:57:31 -0700
  • dfab6dc218 rubocop,this is not a hash :/ Tristan Mahé 2017-04-27 20:49:11 -0700
  • 1bc9f4a6df make rubocop happy Tristan Mahé 2017-04-27 20:43:38 -0700
  • 00471fa983 do not process js events if piwik is not enabled Tristan Mahé 2017-04-27 20:36:19 -0700
  • 9e4c3e9bab do not include piwik code if PIWIK is disabled Tristan Mahé 2017-04-27 20:28:31 -0700
  • bfe41bf7ce Merge remote-tracking branch 'origin/master' into mathtodon 北䑓如法 2017-04-28 12:11:04 +0900
  • 1040378582 Fixed codeclimate Expenses 2017-04-28 15:09:28 +1200
  • 5e7a4b3da8 Merge branch 'master' into favourite-export Expenses 2017-04-28 15:07:10 +1200
  • df6747d8fd First step to a PIWIK_ENABLED=true|false Tristan Mahé 2017-04-27 20:05:44 -0700
  • 08bd94ced4 removed static code from 500.html as we can't dynamically define the url Tristan Mahé 2017-04-27 19:57:05 -0700
  • 3df742b3ba configurable url and siteid for piwik setup Tristan Mahé 2017-04-27 19:55:11 -0700
  • 96d5100c84 Update oj to version 3.0.2 Matt Jankowski 2017-04-27 22:23:46 -0400
  • a963b722a7 enable own design Valentin Ouvrard 2017-04-28 13:23:02 +1100
  • 8573dbbc97 Update webmock to version 3.0.1 Matt Jankowski 2017-04-27 22:11:33 -0400
  • 626da16f0b Fix merge conflicts Ratmir Karabut 2017-04-28 05:10:25 +0300
  • 600f4c2011 Update redis-rack to version 2.0.2 Matt Jankowski 2017-04-27 22:10:20 -0400
  • 88347637d8 Update globalid to version 0.4.0 Matt Jankowski 2017-04-27 22:08:31 -0400
  • 378449ed90 Update pkg-config to version 1.2.0 Matt Jankowski 2017-04-27 22:07:39 -0400
  • 5f6acefafe Update rainbow to version 2.2.2 Matt Jankowski 2017-04-27 22:07:10 -0400
  • ff9f91704e Update httplog to version 0.99.3 Matt Jankowski 2017-04-27 22:06:38 -0400
  • 00ef8ae8ef Update capistrano-rbenv to version 2.1.1 Matt Jankowski 2017-04-27 22:06:21 -0400
  • 27d9efa0c2 Update Russian translation (pluralizations) Ratmir Karabut 2017-04-28 05:05:59 +0300
  • 6b0012afc5 Update json to version 2.1.0 Matt Jankowski 2017-04-27 22:05:31 -0400
  • a302c535df Update ox to version 2.4.13 Matt Jankowski 2017-04-27 22:05:11 -0400
  • 24819b31b8 Update pghero to version 1.6.5 Matt Jankowski 2017-04-27 22:04:39 -0400
  • 5f52f36b4b Update mail to version 2.6.5 Matt Jankowski 2017-04-27 22:04:02 -0400
  • 17350f1103 Update http to version 2.2.2 Matt Jankowski 2017-04-27 22:03:49 -0400
  • f708d9ed45 Update aws-sdk to version 2.9.12 Matt Jankowski 2017-04-27 22:02:51 -0400
  • d51d3f01fa Update autoprefixer-rails to version 6.7.7.2 Matt Jankowski 2017-04-27 22:01:38 -0400
  • 2335b7da83 Return missing page when tag does not exist Matt Jankowski 2017-04-27 21:05:17 -0400
  • 58a31a3f4b Merge branch 'change-notification' into production narabo 2017-04-28 10:03:05 +0900
  • da0a32176d Fix sp layout narabo 2017-04-28 10:02:58 +0900
  • 5e5e10291c rubocop Matt Jankowski 2017-04-27 17:32:12 -0400
  • 70717aed87 Add spec which fails if local_only does not have a left outer join Matt Jankowski 2017-04-27 17:16:09 -0400
  • cf46686f49 Add spec showing that account can find its excluded accounts ids Matt Jankowski 2017-04-27 17:12:12 -0400
  • e488cc8b94 timeline_scope can be private Matt Jankowski 2017-04-27 17:01:21 -0400
  • 0cbd86fc5e DRY up filter application from account or no account Matt Jankowski 2017-04-27 17:00:50 -0400
  • f6e33dff6c Fix bug where silenced accounts were not including statuses from other silenced accounts Matt Jankowski 2017-04-27 16:56:00 -0400
  • aecfeaa8de Extract method for account exclusions Matt Jankowski 2017-04-27 16:38:06 -0400
  • 735c34ede2 Rename method for account specific filtering Matt Jankowski 2017-04-27 16:28:45 -0400
  • d75e119b0c Only join accounts when needed Matt Jankowski 2017-04-27 16:13:12 -0400
  • 00403b1633 Simplify excluded accounts list on account model Matt Jankowski 2017-04-27 15:49:10 -0400
  • bc62eb569f Move list of excluded from timeline account ids to account model Matt Jankowski 2017-04-27 15:45:01 -0400
  • e56c564c53 Extract local_only check to starting scope method Matt Jankowski 2017-04-27 15:34:52 -0400
  • e53f39070f Extract local domain check to local_only scope Matt Jankowski 2017-04-27 15:24:14 -0400