Commit Graph

  • 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
  • 45efa4f102 Convert all ruby Dutch locale (nl) file to utf8 Koala Yeung 2017-04-13 21:25:00 +0800
  • 8898a6e9d4 Fix missing translate in js locale (nl) Koala Yeung 2017-04-13 21:13:37 +0800
  • 4d1506243f Fix syntax error in locale file (nl) Koala Yeung 2017-04-13 21:12:20 +0800
  • 5352dec64e Dutch language javascript locale André 2017-04-09 21:45:42 +0200
  • a1b1a34f7a Dutch language files for Ruby code André 2017-04-09 21:43:34 +0200
  • 6b82d85990 Move validators to app/validators, add to simplecov config Matt Jankowski 2017-04-13 09:47:17 -0400
  • 5bf70a5116 Merge f9b79bb68e into 4fe5e04ea4 André 2017-04-13 13:44:57 +0000
  • 1b92db0bb5 Add Presenters group to SimpleCov configuration Matt Jankowski 2017-04-13 09:39:22 -0400
  • d2c20936f3 Merge remote-tracking branch 'origin/master' Matteo Aquila 2017-04-13 15:33:53 +0200
  • 0220f3a171 Update application.rb Matteo Aquila 2017-04-13 15:33:45 +0200
  • 942a5fd2ae Do not show media attachment as og:image if it was marked as NSFW blackle 2017-04-13 09:33:03 -0400
  • 905a4faa1c Update settings_helper.rb Matteo Aquila 2017-04-13 15:32:31 +0200
  • 5355b7d930 Update settings_helper.rb Matteo Aquila 2017-04-13 15:31:38 +0200
  • e270ab631d Improve the translation instructions re: const names Matt Jankowski 2017-04-13 09:17:37 -0400
  • b6078068f8 Fix naming of JS locale constants Matt Jankowski 2017-04-13 09:16:46 -0400
  • aec2458d81 Merge remote-tracking branch 'tootsuite/master' Matteo Aquila 2017-04-13 15:30:04 +0200
  • 4fe5e04ea4 Fix csv export coverage in export spec (#1691) Matt Jankowski 2017-04-13 09:29:30 -0400
  • 3f42ad7d1a Rename simple_form.it.yml to config/locales/simple_form.it.yml Matteo Aquila 2017-04-13 15:28:30 +0200
  • a26efae0fd Fix issue where 'sensitive content click to show' item takes up whole screen on public view blackle 2017-04-13 09:28:27 -0400
  • f7c466c8d8 Rename devise.it.yml to config/locales/devise.it.yml Matteo Aquila 2017-04-13 15:28:15 +0200
  • 245b9cb4ba Rename doorkeeper.it.yml to config/locales/doorkeeper.it.yml Matteo Aquila 2017-04-13 15:27:56 +0200
  • 9275f92972 Rename it.yml to config/locales/it.yml Matteo Aquila 2017-04-13 15:27:37 +0200
  • 4783b17004 Fix csv export coverage in export spec Matt Jankowski 2017-04-13 09:24:08 -0400
  • 4a6d3bac86 Merge pull request #1 from tootsuite/master Matteo Aquila 2017-04-13 15:23:20 +0200
  • 00cc3066a2 Allow video to be expanded into lightbox blackle 2017-04-13 09:04:18 -0400
  • a57d30c680 [l10n] ja: update missing Japanese translations (#1687) YOSHIOKA Eiichiro 2017-04-13 21:39:14 +0900
  • b9ec4c445f [l10n] ja: update missing Japanese translations YOSHIOKA Eiichiro 2017-04-13 21:16:05 +0900
  • 467d32fce3 [l10n] ja: update missing Japanese translations (#1684) Musee U 2017-04-13 04:40:58 -0700
  • 8aadb7b0b2 Exclude javascript locale file from dup check (#1677) Koala Yeung 2017-04-13 19:40:25 +0800
  • 79546799af Added Italian language (it) (#1679) Matteo Aquila 2017-04-13 13:39:00 +0200
  • 90d0018fd5 Adds Croatian language [Hrvatski] (#1000) May Kittens Devour Your Soul 2017-04-13 13:38:44 +0200
  • d2fe6b2ced
    [l10n] ja: update missing Japanese translations Musee Ullah 2017-04-13 04:26:55 -0700
  • 1a12fd14d4 Merge branch 'master' into master Eugen 2017-04-13 13:26:16 +0200
  • 282bb55c3c fix Portuguese translation (#1661) Hugo Gameiro 2017-04-13 12:25:34 +0100
  • 0e4479bb3a Update Japanese translation files (#1640) 新都心(Neet Shin) 2017-04-13 16:53:45 +0530
  • af7e880df5 Update Russian translation (#1570) Ratmir Karabut 2017-04-13 14:23:23 +0300