Commit Graph

  • c5d694b64b Merge af4d048233 into 380b20eed6 Eugen Rochko 2017-06-08 14:07:07 +0000
  • c2fcd4606c add new setting toggle on home fvh_P 2017-06-08 14:00:53 +0000
  • d7b434f8ed Merge branch 'master' into admin_accounts Matt Jankowski 2017-06-08 09:57:58 -0400
  • 3682ff284a Merge branch 'master' into admin_domain_blocks Matt Jankowski 2017-06-08 09:57:12 -0400
  • 9543d64fb7 commitしわすれてたやつ maa123 2017-06-08 22:55:04 +0900
  • 4eb0c9fb57 Merge remote-tracking branch 'refs/remotes/tootsuite/master' maa123 2017-06-08 22:54:34 +0900
  • a7b5b912e9 Merge remote-tracking branch 'upstream/master' fvh_P 2017-06-08 13:43:58 +0000
  • 380b20eed6 Bump version to 1.4.2 Eugen Rochko 2017-06-08 15:30:43 +0200
  • 43e57a0210 Merge remote-tracking branch 'refs/remotes/tootsuite/master' maa123 2017-06-08 22:30:10 +0900
  • c207b4bb33 Fix db:seed - only run some validations when the field was changed (#3592) Eugen Rochko 2017-06-08 15:22:01 +0200
  • b87eb8ea14 Fix #3378 - If favourite/reblog already exists, return it instead of failing (#3641) Eugen Rochko 2017-06-08 15:07:39 +0200
  • 8902e265b4 Add explit admin actions to (re)subscribe/unsubscribe remote accounts (#3640) Eugen Rochko 2017-06-08 14:58:22 +0200
  • cc04c25bc4 Fix #3378 - If favourite/reblog already exists, return it instead of failing Eugen Rochko 2017-06-08 14:52:00 +0200
  • b16892d133 Merge 4ca1f1171c into b8ea28d6d0 Hiroaki Ninomiya 2017-06-08 12:44:43 +0000
  • b8ea28d6d0 Support multiple trusted proxy ip addresses (#3639) nullkal 2017-06-08 21:33:28 +0900
  • 874f5edc18 Improve how admin NSFW toggle looks Eugen Rochko 2017-06-08 14:31:12 +0200
  • 4651d8abd5 correct coding style nullkal 2017-06-08 21:31:47 +0900
  • 95658f002e Add explit admin actions to (re)subscribe/unsubscribe remote accounts and re-download avatar/header Eugen Rochko 2017-06-08 14:21:13 +0200
  • a359beb60e Support multiple trusted proxy ip addresses nullkal 2017-06-08 21:02:11 +0900
  • df0f3558ae Add tests Eugen Rochko 2017-06-08 13:48:21 +0200
  • f741673638 Fixes #3605 by returning account from database in case of race condition (#3606) ThibG 2017-06-08 13:40:11 +0200
  • 0a0b9a271a Improve RuboCop rules (compatibility to Code Climate) (#3636) Yamagishi Kazutoshi 2017-06-08 20:24:28 +0900
  • 7d2b4186c3 Add Japanese translations (#3635) Yamagishi Kazutoshi 2017-06-08 20:23:56 +0900
  • 90689190a3 i18n: Update Polish translation (#3637) m4sk1n 2017-06-08 13:23:40 +0200
  • 1df3f000cb i18n: Update Polish translation m4sk1n 2017-06-08 11:50:35 +0200
  • f3e17314cf Merge pull request #10 from lnanase/imastodon takayamaki 2017-06-08 15:49:21 +0900
  • ee24d1325b Improve RuboCop rules (compatibility to Code Climate) Yamagishi Kazutoshi 2017-06-08 12:56:43 +0900
  • 73198ef5ab Add Japanese translations Yamagishi Kazutoshi 2017-06-08 11:34:14 +0900
  • a7ce423472 Merge 05f13629b3 into e5b79035d0 Hiroaki Ninomiya 2017-06-08 01:55:36 +0000
  • 05f13629b3 chore(account): add validation specs for account. Hiroaki Ninomiya 2017-06-06 21:56:31 +0900
  • 8acadeea76 fix: Warn if JavaScript is disabled (#3634) Sorin Davidoi 2017-06-08 00:52:56 +0200
  • d005fbf6da fix: Warn if JavaScript is disabled Sorin Davidoi 2017-06-08 00:26:08 +0200
  • 8568952d2c fix(features/compose): Handle external changes to the textarea Sorin Davidoi 2017-06-07 22:03:01 +0200
  • 75c6513c67 Add rake task to prepare database for foreign keys introduced by #3562 (#3614) Eugen Rochko 2017-06-07 20:16:53 +0200
  • 73540ffe6b Clean up for api/base controller (#3629) Matt Jankowski 2017-06-07 14:09:25 -0400
  • 92bb166246 Rest of 2FA translated + small fix (#3630) jeroenpraat 2017-06-07 20:08:34 +0200
  • 8cf8ce4ac0 fix(components/autosuggest_textarea): Race condition regarding onBlur (#3631) Sorin Davidoi 2017-06-07 20:05:53 +0200
  • 628fdd39ab fix(components/autosuggest_textarea): Race condition regarding onBlur Sorin Davidoi 2017-06-07 19:47:45 +0200
  • 985b5d3acb Add coverage for various error cases in api/base controller Matt Jankowski 2017-06-07 12:45:58 -0400
  • 2b1538a0ac API controllers inherit from Api::BaseController Matt Jankowski 2017-06-07 11:55:24 -0400
  • 82f6860de4 Move ApiController to Api/BaseController Matt Jankowski 2017-06-07 11:52:03 -0400
  • 0f1b1d78b1 Use "match_array" only for order independent assertions (#3626) unarist 2017-06-08 01:59:28 +0900
  • 4dffd8ce1f Rest of 2FA translated + small fix jeroenpraat 2017-06-07 18:55:29 +0200
  • d3bbef27e7 Fix broken screenshot Eugen Rochko 2017-06-07 17:53:47 +0200
  • 13a81c6086 Merge 386f92a5cf into f0634ba876 ryo sukekawa 2017-06-07 15:33:33 +0000
  • f0634ba876 Coverage improvement and concern extraction for rate limit headers in API controller (#3625) Matt Jankowski 2017-06-07 11:23:26 -0400
  • 812fd1849d specs cleanup Matt Jankowski 2017-06-07 10:59:41 -0400
  • 8b8e0671f2 Move header setting into smaller methods Matt Jankowski 2017-06-07 10:54:11 -0400
  • e14394b98a Move utc timestamp to separate method Matt Jankowski 2017-06-07 10:42:20 -0400
  • 1ad16d2a20 Move match_data variable into method Matt Jankowski 2017-06-07 10:38:49 -0400
  • aad8fa3aba Move throttle check to condition on before_action Matt Jankowski 2017-06-07 10:34:27 -0400
  • e4f963beaf Move rate limit headers methods to concern Matt Jankowski 2017-06-07 10:32:28 -0400
  • e968de9e40 Coverage for rate limit headers Matt Jankowski 2017-06-07 10:29:49 -0400
  • 7a492a1878 Use "match_array" only for order independent assertions unarist 2017-06-07 23:41:43 +0900
  • 1d68fe1a60 Fix Code Climate failed (regression from #3622) (#3624) Yamagishi Kazutoshi 2017-06-07 22:57:59 +0900
  • 6bd6dcf6df Allow "class" attribute on the "a" tag in sanitization (#3623) unarist 2017-06-07 22:57:30 +0900
  • bb711f7310 fix pull request #8 lnanase 2017-06-07 22:33:40 +0900
  • a7955d00dc Fix Code Climate failed (regression from #3622) Yamagishi Kazutoshi 2017-06-07 19:44:31 +0900
  • db3e05a74e Allow "class" attribute on the "a" tag in sanitization unarist 2017-06-07 19:34:13 +0900
  • 28d2920472 Fixes #3388 by moving re-entrant `shared_status_from_xml` before transaction block (#3622) ThibG 2017-06-07 12:28:16 +0200
  • e65537a7d1 Fixes #3388 by moving re-entrant `shared_status_from_xml` before transaction block Thibaut Girka 2017-06-07 12:17:31 +0200
  • cc00c08c99 Merge tag 'v1.4.1' into imastodon lnanase 2017-06-07 17:02:43 +0900
  • 34bfea8bbf Small changes to japanese translation (#3620) Yamagishi Kazutoshi 2017-06-07 17:15:35 +0900
  • 762c03bbaa Small changes to japanese translation Yamagishi Kazutoshi 2017-06-07 17:09:43 +0900
  • badc3467d3 Fix typo Eugen Rochko 2017-06-07 09:59:27 +0200
  • 2d91944285 Don't show business e-mail if it's blank (#3619) STJrInuyasha 2017-06-07 00:57:47 -0700
  • 4a7c9d45d6 Don't show business e-mail if it's blank Inuyasha 2017-06-07 00:22:58 -0700
  • 640296a623 Merge 7d1e44ec8b into 0026ba2751 June Rhodes 2017-06-07 06:06:50 +0000
  • fe6c077fdb Merge ccc67e2cb9 into 0026ba2751 June Rhodes 2017-06-07 06:06:49 +0000
  • 99268c8bde Do not delete OAuth values where NULL values may be permitted Eugen Rochko 2017-06-07 02:34:42 +0200
  • a228ec7cf6 Merge pull request #8 from lnanase/add_admin_message_board takayamaki 2017-06-07 04:31:29 +0900
  • 0026ba2751 Update nokogumbo to 1.4.13 (#3617) Daigo 3 Dango 2017-06-06 18:43:02 +0000
  • b5e2449019 Merge fd769ce67c into b623dd12c1 Eugen Rochko 2017-06-06 18:13:17 +0000
  • 1cd2dbda0a Merge 65be381c7a into b623dd12c1 Nolan Lawson 2017-06-06 18:13:17 +0000
  • 3fcf810b7f Update nokogumbo to 1.4.13 zunda 2017-06-06 07:38:19 -1000
  • 867be189dd Fix typo Eugen Rochko 2017-06-06 19:33:32 +0200
  • b623dd12c1 Use preview image in <ImageLoader /> to provide immediate visual feedback (#3595) Eugen Rochko 2017-06-06 19:30:17 +0200
  • 722d152082 Fix #3063 - Add dynamic app manifest (#3563) Eugen Rochko 2017-06-06 19:29:42 +0200
  • 9202912bae Merge remote-tracking branch 'upstream/master' fvh_P 2017-06-06 15:55:13 +0000
  • bcc8dcaf73 Add missing word in pt and pt-BR (regression from #3564) Yamagishi Kazutoshi 2017-06-07 00:16:00 +0900
  • 7623766241 Add regex filters on the community timeline and the public timeline. (#3564) ふぁぼ原 2017-06-06 23:56:10 +0900
  • e34c5a3503 Fix 500 errors on searching invalid URLs (#3613) unarist 2017-06-06 23:44:48 +0900
  • 71f2db2dc2 Add rake task to prepare database for foreign keys introduced by #3562 Eugen Rochko 2017-06-06 16:42:30 +0200
  • c747a13d10 change keys of locale settings fvh_P 2017-06-06 14:41:00 +0000
  • 3884a608e2 adjust to upstream fvh_P 2017-06-06 14:24:30 +0000
  • 630ef3a050 adjust to upstream fvh_P 2017-06-06 14:19:29 +0000
  • 55129458bb Fix 500 errors on searching invalid URLs unarist 2017-06-06 23:12:46 +0900
  • 004672aa6c Fix tag search order and not to use tsvector (#3611) unarist 2017-06-06 23:07:06 +0900
  • 74d670e729 reset the state of the locale files in app/javascript/mastodon/locales fvh_P 2017-06-06 13:58:48 +0000
  • 25c0008a81 Merge pull request #58 from ykzts/qiitadon-fix-rt-icon Hiroyuki Tomine 2017-06-06 22:34:56 +0900
  • a4431cdb5e bugfix(account): make validation works correctly. Hiroaki Ninomiya 2017-06-06 22:30:54 +0900
  • 7779c7b422 Fix tag search order and not to use tsvector unarist 2017-06-06 21:24:37 +0900
  • 5312369df3 Merge pull request #46 from increments/make-columns-wider Hiroyuki Tomine 2017-06-06 22:22:10 +0900
  • 29ec0ca8d8 To make wider the last div of columns-area htomine 2017-05-30 18:13:18 +0900
  • 5dab80af96 Merge branch 'qiitadon' into qiitadon-fix-rt-icon Yamagishi Kazutoshi 2017-06-06 21:29:31 +0900
  • 77d6c54586 Merge pull request #57 from ykzts/qiitadon-encode-data-uri Hiroyuki Tomine 2017-06-06 21:25:21 +0900
  • ad4a28f4f6 Refactor translationRunner.js (#3604) Yamagishi Kazutoshi 2017-06-06 20:31:57 +0900
  • f00b4730ff Merge 9313a90578 into d8ae3efec3 test 2017-06-06 11:24:43 +0000
  • d8ae3efec3 Improve ESLint rules for JSX (#3608) Yamagishi Kazutoshi 2017-06-06 20:20:07 +0900
  • cd81a1c52a Add missing key attribute to .search-results__hashtag (#3607) Yamagishi Kazutoshi 2017-06-06 20:19:29 +0900