Commit Graph

  • 0f889523e4 views/about: use Setting.site_title instead of hardcoding (#1508) Alex Dunn 2017-04-15 04:28:09 -07:00
  • f4045ba3d9 Add eslint-plugin-jsx-a11y (#1651) Zac Anger 2017-04-15 05:27:27 -06:00
  • df4ff9a8e1 Add recovery code support for two-factor auth (#1773) Patrick Figel 2017-04-15 13:26:03 +02:00
  • 67ad84b7eb Add some missing Spanish translations (#1818) luigi 2017-04-15 13:25:00 +02:00
  • f0f6a3279a Update ja.jsx (#1822) Amakasu Ryoma 2017-04-15 20:24:33 +09:00
  • 9e620ca16c Fix Japanese translation of ja.yml (#1835) Setuu 2017-04-15 20:18:08 +09:00
  • bddd36f260 Add a classname to the loading bar (#1826) Alda Marteau-Hardi 2017-04-15 13:17:54 +02:00
  • b857551617 fixed privacy mistake of japanese translation of privacy.change (#1832) Keiji, Yoshimi 2017-04-15 20:17:20 +09:00
  • e28a5aab08 Add tasks for open/close registration (#1823) Andrew 2017-04-15 04:17:07 -07:00
  • f9d7ec8971 ActiveRecord::Relation does not respond to #id (#1834) alpaca-tc 2017-04-15 20:16:24 +09:00
  • 40fd1de488 Account search service refactor (#1791) Matt Jankowski 2017-04-14 21:17:07 -04:00
  • 31f0bcf804 Refresh webfinger (#1323) ThibG 2017-04-15 03:16:05 +02:00
  • 09540192c9 Rename admin/accounts_helper to admin/filter_helper (#1816) Matt Jankowski 2017-04-14 21:09:55 -04:00
  • 08059ddda9 jslint: fix jslint warnings (#1704) Koala Yeung 2017-04-15 08:57:26 +08:00
  • a3aa9381c4 Update devise.fr.yml (#1728) goofy-bz 2017-04-15 02:55:43 +02:00
  • 120a37a197 Add translations for zh-TW (Taiwan) (#1794) Shouko Yu 2017-04-15 08:49:43 +08:00
  • ec9999cdfe Update Traditional Chinese, HK (zh-HK) translation (#1759) Koala Yeung 2017-04-15 08:48:30 +08:00
  • e806d3c3f0 Update nl.yml (#1764) Fjoerfoks 2017-04-15 02:45:46 +02:00
  • 4ba6acd518 Update nl.jxs (#1766) Fjoerfoks 2017-04-15 02:44:33 +02:00
  • 061922b38c Update devise.fr.yml (#1792) Olivier Humbert 2017-04-15 02:44:10 +02:00
  • 5d8d827436 Update Russian translation (#1733) Ratmir Karabut 2017-04-15 03:43:51 +03:00
  • cde1f37d93 Use site title on tags#show page (#1802) Matt Jankowski 2017-04-14 20:37:20 -04:00
  • 89707ad0ac add basic microformats tests (#1803) Ben Roberts 2017-04-14 20:37:00 -04:00
  • 4bebeb27d3 More Norwegian translations (#1805) Thor Harald Johansen 2017-04-15 02:33:37 +02:00
  • ef879a8839 Send initial state in a <script type="application/json"> tag (#1806) Joachim Viide 2017-04-15 03:32:42 +03:00
  • 9240ca6cef Mispelling & minor fixes (#1814) Darío Hereñú 2017-04-14 21:31:16 -03:00
  • 619817d29e Remove unused will_paginate.page_gap key from i18n (#1815) Matt Jankowski 2017-04-14 20:30:55 -04:00
  • 0655f16cc1 [css] reduce spacing between text elements on about pages (#1510) Alex Dunn 2017-04-14 17:29:32 -07:00
  • ade004b5ee Polish translation (needs more love though) (#807) rysiekpl 2017-04-15 02:22:46 +02:00
  • 7609593e48 Add REDIS_DB env variable to configure Redis database (#1366) Les Orchard 2017-04-14 20:21:13 -04:00
  • a9529d3b4b Allow running mastodon on a different domain as the one used for identifying users (#1267) ThibG 2017-04-15 02:15:46 +02:00
  • 0d2910478a Use image too in docker-compose (#1109) Pierre Ozoux 2017-04-15 01:07:59 +01:00
  • 5ab0ffc6c8 Custom Paperclip path. (#778) Valentin Lorentz 2017-04-15 02:07:21 +02:00
  • 8482f67caf update Node to 6.x LTS (#1228) Alex Dunn 2017-04-14 17:05:41 -07:00
  • fe8dd58bc1 Add list of muted user to UI and Getting Started (#1799) Patrick Figel 2017-04-15 01:23:49 +02:00
  • 92cd207c50 Introduce capybara and first feature spec (#1801) Chad Pytel 2017-04-14 19:21:02 -04:00
  • f5cd138323 Improve i18n chooser (#1804) Matt Jankowski 2017-04-14 19:12:39 -04:00
  • 66ea015a01 Remove current directory from PATH (#1779) Kazuhiro NISHIYAMA 2017-04-15 02:10:38 +09:00
  • 1616cf98a1 Add missing Japanese translations (#1785) Kazuhiro NISHIYAMA 2017-04-15 02:10:12 +09:00
  • 5aae6384ff Fix Japanese translation for remote_follow (#1771) Takayuki KUSANO 2017-04-15 02:09:52 +09:00
  • fa89deb4eb Add title attribute to URLs in statuses (#1755) Luc Didry 2017-04-14 13:22:56 +02:00
  • 26a892dd90 Fix invalid byte sequence issue in nl.jsx (#1751) Matt Jankowski 2017-04-14 07:00:03 -04:00
  • 8321884eef Change usage of gsub to delete, as per Code Climate/Rubocop recommendation (#1753) Effy Elden 2017-04-14 20:50:00 +10:00
  • 290e8ef854 Remove .keep in models (#1748) 西小倉宏信 2017-04-14 19:43:29 +09:00
  • 067eb220c6 Include pkg-config as a gem dependency. (#1717) Bryce Chidester 2017-04-14 02:15:03 -07:00
  • 1467515d3d Use landmark regions on columns (#1732) JP DeVries 2017-04-14 11:12:59 +02:00
  • 8b74aa4217 Admin reports controller improvements (#1714) Matt Jankowski 2017-04-14 05:10:28 -04:00
  • a6807201d2 Implementing Subresource Integrity (#1729) maxypy 2017-04-14 11:09:20 +02:00
  • 4445ebdad2 Fix getting started commands out of order (#1737) Ian Kelling 2017-04-14 01:04:19 -08:00
  • c019b0acfd Modify ActionMailer configuration to default to ENV['LOCAL_DOMAIN'] if ENV['SMTP_DOMAIN'] is not set. The previous fallback, config.x.local_domain, is undefined when the code is called. (#1745) Effy Elden 2017-04-14 19:02:25 +10:00
  • 7447e7a2ea Merge branch 'matteoaquila-master' Eugen Rochko 2017-04-13 22:26:54 +02:00
  • c8be05a4a7 Fix italian translation Eugen Rochko 2017-04-13 22:26:32 +02:00
  • 41c697fd81 Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master Eugen Rochko 2017-04-13 22:25:07 +02:00
  • c5afe573da Fix drag & drop overlay not appearing on firefox (#1721) Eugen 2017-04-13 22:21:34 +02:00
  • 485310a43c Make browserify respect changes in node_modules for asset compilation (#1722) Eugen 2017-04-13 22:21:20 +02:00
  • 9aae9ae40c Update devise.it.yml Matteo Aquila 2017-04-13 22:09:47 +02:00
  • 1fb125b630 Update devise.it.yml Matteo Aquila 2017-04-13 22:06:19 +02:00
  • 057567d548 Make boost modal off by default (#1719) Eugen 2017-04-13 21:53:59 +02:00
  • 169c68a739 Add filename extension to paperclip (#1718) Yusuke Abe 2017-04-14 04:52:56 +09:00
  • 9f182346d7 Use english in reported by translation (#1713) Matt Jankowski 2017-04-13 15:49:46 -04:00
  • a58c935c3d Fr missing strings (#1708) spf 2017-04-13 21:49:34 +02:00
  • c0c56db0fa Translate admin (#1702) Thomas Citharel 2017-04-13 21:49:07 +02:00
  • d9dc0fe84e smtp delivery type fix (#1556) James Moore 2017-04-13 10:51:49 -07:00
  • 55b56e3f95 terms: remove redundant words (#1578) Alyssa Ross 2017-04-13 18:50:19 +01:00
  • c4d39b1b3d quick typo fix in en.jsx: Rejec -> Reject (#1701) R Tucker 2017-04-13 13:37:04 -04:00
  • ac54da9394 Fix #1220, fix #1671 - Hook up comment box to the Redux comment value (#1699) Eugen 2017-04-13 19:36:41 +02:00
  • 043862f411 Fix #1609, fix #1628 - Revert #1397 (#1700) Eugen 2017-04-13 19:23:36 +02:00
  • 9e5c1c487e Apply i18n-tasks normalize to locales (#1696) Eugen 2017-04-13 19:18:32 +02:00
  • 5619099564 translation: Fix comment out issue in en.jsx (#1698) INAGAKI Hiroshi 2017-04-14 00:11:18 +09:00
  • ce80d0b0a9 Fix minor jslint issue (#1697) Koala Yeung 2017-04-13 23:10:48 +08:00
  • 6327f69cab Merge branch 'blackle-videolightbox' Eugen Rochko 2017-04-13 17:01:52 +02:00
  • 5f8155482a Add overlay style to buttons, continue video after expanding it Eugen Rochko 2017-04-13 17:01:09 +02:00
  • efcf9448da Update settings_helper.rb Matteo Aquila 2017-04-13 16:16:39 +02:00
  • e70b84b1dc Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videolightbox Eugen Rochko 2017-04-13 16:14:11 +02:00
  • d7a4e8739a Ignore postgres/redis folder from docker-compose (#1645) Lukas Burk 2017-04-13 16:04:20 +02:00
  • 9362700137 Convert emoji shortnames when sending status (#1666) Rachel H 2017-04-13 07:03:45 -07:00
  • 1206627c59 Add Dutch translation (nl) (#1682) Koala Yeung 2017-04-13 22:02:23 +08:00
  • 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 -04:00
  • b330d1f000 Organize coverage dirs (#1695) Matt Jankowski 2017-04-13 10:00:31 -04:00
  • 1a5a54eb4b Merge branch 'master' into master Eugen 2017-04-13 16:00:20 +02:00
  • 447b8bc44e Do not show media attachment as og:image if it was marked as NSFW (#1693) Isabelle Knott 2017-04-13 09:59:43 -04:00
  • 093879c177 Fix language export variables (#1689) Matt Jankowski 2017-04-13 09:59:12 -04:00
  • d2c20936f3 Merge remote-tracking branch 'origin/master' Matteo Aquila 2017-04-13 15:33:53 +02:00
  • 0220f3a171 Update application.rb Matteo Aquila 2017-04-13 15:33:45 +02:00
  • 905a4faa1c Update settings_helper.rb Matteo Aquila 2017-04-13 15:32:31 +02:00
  • 5355b7d930 Update settings_helper.rb Matteo Aquila 2017-04-13 15:31:38 +02:00
  • aec2458d81 Merge remote-tracking branch 'tootsuite/master' Matteo Aquila 2017-04-13 15:30:04 +02:00
  • 4fe5e04ea4 Fix csv export coverage in export spec (#1691) Matt Jankowski 2017-04-13 09:29:30 -04:00
  • 3f42ad7d1a Rename simple_form.it.yml to config/locales/simple_form.it.yml Matteo Aquila 2017-04-13 15:28:30 +02:00
  • f7c466c8d8 Rename devise.it.yml to config/locales/devise.it.yml Matteo Aquila 2017-04-13 15:28:15 +02:00
  • 245b9cb4ba Rename doorkeeper.it.yml to config/locales/doorkeeper.it.yml Matteo Aquila 2017-04-13 15:27:56 +02:00
  • 9275f92972 Rename it.yml to config/locales/it.yml Matteo Aquila 2017-04-13 15:27:37 +02:00
  • 4a6d3bac86 Merge pull request #1 from tootsuite/master Matteo Aquila 2017-04-13 15:23:20 +02:00
  • 00cc3066a2 Allow video to be expanded into lightbox blackle 2017-04-13 09:04:18 -04:00
  • a57d30c680 [l10n] ja: update missing Japanese translations (#1687) YOSHIOKA Eiichiro 2017-04-13 21:39:14 +09:00
  • 467d32fce3 [l10n] ja: update missing Japanese translations (#1684) Musee U 2017-04-13 04:40:58 -07:00
  • 8aadb7b0b2 Exclude javascript locale file from dup check (#1677) Koala Yeung 2017-04-13 19:40:25 +08:00
  • 79546799af Added Italian language (it) (#1679) Matteo Aquila 2017-04-13 13:39:00 +02:00
  • 90d0018fd5 Adds Croatian language [Hrvatski] (#1000) May Kittens Devour Your Soul 2017-04-13 13:38:44 +02:00
  • 1a12fd14d4 Merge branch 'master' into master Eugen 2017-04-13 13:26:16 +02:00