Commit Graph

  • 453415f2a2 Rubocop styles Matt Jankowski 2017-04-13 16:12:40 -0400
  • 66e6dc6fd7 DRY up current account action taken params Matt Jankowski 2017-04-13 14:50:07 -0400
  • e6f1606996 Add Report#statuses method Matt Jankowski 2017-04-13 14:47:37 -0400
  • 4924023ab2 Clean up admin/reports routes Matt Jankowski 2017-04-13 14:09:04 -0400
  • 933412c00e DRY up resolution of related reports for target account Matt Jankowski 2017-04-13 13:19:33 -0400
  • 7a58d19f98 Add coverage for admin/reports controller Matt Jankowski 2017-04-13 12:57:14 -0400
  • 8307e32300 Fix issue where reports view could not access filter_link_to Matt Jankowski 2017-04-13 12:12:55 -0400
  • 6a7449b1a7 Rename parameter to resolved Matt Jankowski 2017-04-13 12:09:05 -0400
  • 9ea501f53f Simplify admin/reports controller filtering for index Matt Jankowski 2017-04-13 11:15:44 -0400
  • 43c0981bca Merge pull request #10 from tootsuite/master Hugo Gameiro 2017-04-13 22:09:39 +0100
  • 16bd3b9e74 Merge branch 'master' into enhancement/jsx-a11y Zac Anger 2017-04-13 14:34:07 -0600
  • 5a4e28d9bd Update yarn.lock. zacanger 2017-04-13 14:33:57 -0600
  • 1ebcdf84b5 Merge branch 'master' into skylight Eugen Rochko 2017-04-13 22:28:33 +0200
  • 7447e7a2ea Merge branch 'matteoaquila-master' v1.1.2 Eugen Rochko 2017-04-13 22:26:54 +0200
  • c8be05a4a7 Fix italian translation Eugen Rochko 2017-04-13 22:26:32 +0200
  • 41c697fd81 Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master Eugen Rochko 2017-04-13 22:25:07 +0200
  • 791c0edfe8 Merge branch 'master' into skylight Eugen Rochko 2017-04-13 22:22:26 +0200
  • c5afe573da Fix drag & drop overlay not appearing on firefox (#1721) Eugen 2017-04-13 22:21:34 +0200
  • 485310a43c Make browserify respect changes in node_modules for asset compilation (#1722) Eugen 2017-04-13 22:21:20 +0200
  • 9aae9ae40c Update devise.it.yml Matteo Aquila 2017-04-13 22:09:47 +0200
  • 9340c8097d Adding slightly more padding back tom 2017-04-13 16:07:10 -0400
  • 1fb125b630 Update devise.it.yml Matteo Aquila 2017-04-13 22:06:19 +0200
  • 7231cd73d1 move the character count over tom 2017-04-13 15:58:05 -0400
  • 17c2ba7366 Merge branch 'master' into skylight Eugen Rochko 2017-04-13 21:55:13 +0200
  • 542703e88c Update components.scss tom 2017-04-13 15:54:40 -0400
  • 057567d548 Make boost modal off by default (#1719) Eugen 2017-04-13 21:53:59 +0200
  • 169c68a739 Add filename extension to paperclip (#1718) Yusuke Abe 2017-04-14 04:52:56 +0900
  • 361d8127f3 Make boost modal off by default Eugen Rochko 2017-04-13 21:51:38 +0200
  • 9f182346d7 Use english in reported by translation (#1713) Matt Jankowski 2017-04-13 15:49:46 -0400
  • a58c935c3d Fr missing strings (#1708) spf 2017-04-13 21:49:34 +0200
  • 174abe91c3 Merge branch 'master' into fr-missing-strings Eugen 2017-04-13 21:49:28 +0200
  • c0c56db0fa Translate admin (#1702) Thomas Citharel 2017-04-13 21:49:07 +0200
  • 0f067d5925 Update components.scss tom 2017-04-13 15:48:38 -0400
  • 88763d2192 Merge branch 'master' into feature-onboarding Eugen Rochko 2017-04-13 21:45:46 +0200
  • d2aa3a517a Add filename extension to paperclip chansuke 2017-04-14 04:41:57 +0900
  • c56a5146c9 Include pkg-config as a gem dependency. Bryce Chidester 2017-04-13 12:33:31 -0700
  • f9ca98a125 Fixes based on review. zacanger 2017-04-13 13:01:25 -0600
  • 72d48a4fc9 Fix text wrapping in buttons in some translations tom 2017-04-13 14:56:05 -0400
  • 38c4181aad Use english in reported by translation Matt Jankowski 2017-04-13 12:14:47 -0400
  • c7669315c9 normalize l18n Thomas Citharel 2017-04-13 20:26:24 +0200
  • f2b25ecbdb move reports translation & translate sidebar Thomas Citharel 2017-04-13 17:49:49 +0200
  • da9494cfd3 translate account section and correct typos Thomas Citharel 2017-04-13 17:41:16 +0200
  • 2579029bcf Translate PubSubHubbub section Thomas Citharel 2017-04-12 17:17:37 +0200
  • b05db6e167 Translate the domain_block panel Thomas Citharel 2017-04-12 17:05:48 +0200
  • 9864b6f323 Merge branch 'enhancement/jsx-a11y' of github.com:zacanger/mastodon into enhancement/jsx-a11y zacanger 2017-04-13 12:17:47 -0600
  • 281552b722 Revert change to load_more. zacanger 2017-04-13 12:17:36 -0600
  • c46f606fbe Merge branch 'master' into enhancement/jsx-a11y Zac Anger 2017-04-13 12:16:22 -0600
  • 676ccff12b Merge branch 'enhancement/jsx-a11y' of github.com:zacanger/mastodon into enhancement/jsx-a11y zacanger 2017-04-13 12:15:51 -0600
  • 435f183d4e Add cursor:pointer to load-more zacanger 2017-04-13 12:15:37 -0600
  • 3c0145daa2 Make browserify respect changes in node_modules for asset compilation Eugen Rochko 2017-04-13 19:58:06 +0200
  • 10e0c14ad7 Merge d947c03e98 into d9dc0fe84e Brad Urani 2017-04-13 17:57:35 +0000
  • d9dc0fe84e smtp delivery type fix (#1556) James Moore 2017-04-13 10:51:49 -0700
  • 55b56e3f95 terms: remove redundant words (#1578) Alyssa Ross 2017-04-13 18:50:19 +0100
  • 672c103f3f Merge branch 'master' into enhancement/jsx-a11y Zac Anger 2017-04-13 11:48:05 -0600
  • c4d39b1b3d quick typo fix in en.jsx: Rejec -> Reject (#1701) R Tucker 2017-04-13 13:37:04 -0400
  • ac54da9394 Fix #1220, fix #1671 - Hook up comment box to the Redux comment value (#1699) Eugen 2017-04-13 19:36:41 +0200
  • 8051787225 Merge 82b4467b93 into 043862f411 codl 2017-04-13 17:25:06 +0000
  • bb7abc816f Merge branch 'master' into enhancement/jsx-a11y Zac Anger 2017-04-13 11:24:05 -0600
  • 043862f411 Fix #1609, fix #1628 - Revert #1397 (#1700) Eugen 2017-04-13 19:23:36 +0200
  • 1893133b8b Fix missing tabIndex. zacanger 2017-04-13 11:21:40 -0600
  • 9e5c1c487e Apply `i18n-tasks normalize` to locales (#1696) Eugen 2017-04-13 19:18:32 +0200
  • 90f50b24c3 Make contents of boost confirmation dialog scroll tom 2017-04-13 13:16:12 -0400
  • 6e455a2798 fr - note too long translation SansPseudoFix 2017-04-13 18:30:49 +0200
  • 05e3a6e8dc Fix "TypeError: Cannot read property 'isRequired' of undefined" Henry Smith 2017-04-13 18:14:56 +0200
  • ebf7db5579 jslint: fix no-nested-ternary issue Koala Yeung 2017-04-14 00:00:47 +0800
  • 2f7a759b72 jslint: remove trailing space Koala Yeung 2017-04-13 23:54:01 +0800
  • d83acc9934 Fix missing translation for username already taken SansPseudoFix 2017-04-13 17:53:17 +0200
  • 7305feef9f quick typo fix in en.jsx: Rejec -> Reject Ryan Tucker 2017-04-13 11:46:21 -0400
  • 372131eeb9 Fix #1609, fix #1628 - Revert #1397 When transmitting data in a HTML-encoded element like <content type="html" />, relying on newlines being preserved is not wise, since HTML by itself does not care for newlines - it cares for <p> and <br> Eugen Rochko 2017-04-13 17:31:00 +0200
  • 78a7734d25 Merge branch 'master' into enhancement/jsx-a11y Zac Anger 2017-04-13 09:30:13 -0600
  • 80a5de7c55 Handle htmlFor (partially), a that's actually a button. zacanger 2017-04-13 09:29:15 -0600
  • a95d358be2 Fix #1220, fix #1671 - Hook up comment box to the Redux comment value Fix username styling regression introduced in #1063 Fix report screen background regression introduced in #1415 Eugen Rochko 2017-04-13 17:21:00 +0200
  • 1a26f7bb90 Merge 0ece72dab0 into 5619099564 Rachel H 2017-04-13 15:13:28 +0000
  • aaa9f64ca3 Merge 87efb890e8 into 5619099564 Rachel H 2017-04-13 15:13:28 +0000
  • 5619099564 translation: Fix comment out issue in en.jsx (#1698) INAGAKI Hiroshi 2017-04-14 00:11:18 +0900
  • ce80d0b0a9 Fix minor jslint issue (#1697) Koala Yeung 2017-04-13 23:10:48 +0800
  • 0fde5559bf Merge branch 'master' into jslint Koala Yeung 2017-04-13 23:09:51 +0800
  • 3730aa27e2 Merge branch 'master' into l10n-ja Eugen 2017-04-13 17:08:48 +0200
  • 95cf47b464 Merge branch 'master' into enhancement/jsx-a11y Zac Anger 2017-04-13 09:06:29 -0600
  • 6327f69cab Merge branch 'blackle-videolightbox' Eugen Rochko 2017-04-13 17:01:52 +0200
  • 5f8155482a Add overlay style to buttons, continue video after expanding it Eugen Rochko 2017-04-13 17:01:09 +0200
  • be9dd70fe5 Remove white space pre-wrap in status div Matt Jankowski 2017-04-12 14:29:34 -0400
  • 60ab0f5e1d translation: Fix comment out issue in en.jsx INAGAKI Hiroshi 2017-04-13 23:38:47 +0900
  • cd87e72ed4 Add vim and Mac files to .gitignore and .dockerignore. zacanger 2017-04-13 08:27:41 -0600
  • 863fda4b70 Fix minor jslint issue Koala Yeung 2017-04-13 22:26:54 +0800
  • d9bb822dff Merge branch 'master' into enhancement/jsx-a11y Zac Anger 2017-04-13 08:26:54 -0600
  • efcf9448da Update settings_helper.rb Matteo Aquila 2017-04-13 16:16:39 +0200
  • 6bb48d5c8b Merge remote-tracking branch 'tootsuite/master' Matteo Aquila 2017-04-13 16:14:48 +0200
  • e70b84b1dc Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videolightbox Eugen Rochko 2017-04-13 16:14:11 +0200
  • 4203afbaec Apply `i18n-tasks normalize` to locales Eugen Rochko 2017-04-13 16:09:59 +0200
  • d7a4e8739a Ignore postgres/redis folder from docker-compose (#1645) Lukas Burk 2017-04-13 16:04:20 +0200
  • 9362700137 Convert emoji shortnames when sending status (#1666) Rachel H 2017-04-13 07:03:45 -0700
  • 1206627c59 Add Dutch translation (nl) (#1682) Koala Yeung 2017-04-13 22:02:23 +0800
  • edefcfcf42 Fix issue where 'sensitive content click to show' item takes up whole screen on public view (#1692) Isabelle Knott 2017-04-13 10:00:56 -0400
  • b330d1f000 Organize coverage dirs (#1695) Matt Jankowski 2017-04-13 10:00:31 -0400
  • 1a5a54eb4b Merge branch 'master' into master Eugen 2017-04-13 16:00:20 +0200
  • 447b8bc44e Do not show media attachment as og:image if it was marked as NSFW (#1693) Isabelle Knott 2017-04-13 09:59:43 -0400
  • 093879c177 Fix language export variables (#1689) Matt Jankowski 2017-04-13 09:59:12 -0400
  • 397862db55 Fix indentation error in doorkeeper.nl.yml Koala Yeung 2017-04-13 21:47:52 +0800
  • db29426fc5 Fix duplicated key in devise.nl.yml Koala Yeung 2017-04-13 21:39:15 +0800