Commit graph

  • 0d6c1e9cba missing translate ja.yml (#2100) Isao Sugimoto 2017-04-19 05:29:39 +09:00
  • ff5baa5349 Add rate limits for logins and sign-ups by IP (5 in 5 minutes) (#2079) Eugen 2017-04-18 22:29:14 +02:00
  • 297c11dba2 Language detection refactor (#2099) Matt Jankowski 2017-04-18 16:20:12 -04:00
  • 0a7588282a Remove API authentication for public statuses (after review) (#1919) happycoloredbanana 2017-04-18 22:58:57 +03:00
  • 3ed219f907 Polish zh-cn js translation (#2090) Mingye Wang 2017-04-18 15:29:31 -04:00
  • 55e1503522 Instances list in admin (#2095) Matt Jankowski 2017-04-18 15:09:07 -04:00
  • 66d8f99a30 Admin reports with accounts (#2092) Matt Jankowski 2017-04-18 13:36:18 -04:00
  • f23281e31e Disable toot button when above 500 characters (#2088) Tomohiro Suwa 2017-04-19 02:35:55 +09:00
  • 9783d8b6c0 fix admin input display (#1633) spf 2017-04-18 17:25:44 +02:00
  • 7525971561 Moving aria-label to div.column (#1769) JP DeVries 2017-04-18 17:21:25 +02:00
  • 84b5fae8e3 Simplify renders in views (#2084) Matt Jankowski 2017-04-18 11:15:30 -04:00
  • d90b1650d8 Update storybook file autoload (#2057) usagi-f 2017-04-18 23:04:35 +09:00
  • 23ecc681c4 Add "Mastodon" to user agent (#2073) ik-fib 2017-04-18 23:04:13 +09:00
  • 82bbf57e7a Translate onboarding dialog to japanese (#2062) Keiji, Yoshimi 2017-04-18 23:03:27 +09:00
  • 0790aa9165 Fix streaming server worker count (#2082) kuro5hin 2017-04-18 09:58:22 -04:00
  • e2a1b574ab Avoid dynamic methods due to processing speed (#2080) 839 2017-04-18 22:57:46 +09:00
  • 880590ad0d Fix header icons in navigation bar (#2081) Andrey Blinov 2017-04-18 16:57:16 +03:00
  • ee919bedd6 French translation update (#2063) Olivier Humbert 2017-04-18 15:21:47 +02:00
  • 0a1b024600 Add Occitan (oc) translation (#2077) Koala Yeung 2017-04-18 21:21:16 +08:00
  • 50ed72767d Update Russian translation (#1967) Ratmir Karabut 2017-04-18 16:20:37 +03:00
  • 75910abd8f Add hasMore field to account timeline (#2066) geta6 2017-04-18 20:10:49 +09:00
  • 93c13fe691 Merge branch 'patf-pause-gif' Eugen Rochko 2017-04-18 01:58:14 +02:00
  • 42d54dc9ea Adjust visuals of non-autoplaying GIFV Eugen Rochko 2017-04-18 01:57:50 +02:00
  • 57d784f1e4 Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif Eugen Rochko 2017-04-18 01:25:50 +02:00
  • 16d50f60d1 Remove unused methods (#1730) Matt Jankowski 2017-04-17 19:21:55 -04:00
  • 0e0347ea3c Merge branch 'pixiv-fix/cache_blocking' Eugen Rochko 2017-04-18 01:20:29 +02:00
  • f5cd0b4956 Rename cache key to exclude_account_ids_for:id, adjust formatting Eugen Rochko 2017-04-18 01:14:02 +02:00
  • 2fd0473aa1 Merge branch 'fix/cache_blocking' of git://github.com/pixiv/mastodon into pixiv-fix/cache_blocking Eugen Rochko 2017-04-18 01:09:57 +02:00
  • f03fb6c0ae Add forgotten AtomSerializer spec (#2047) Eugen 2017-04-18 01:07:46 +02:00
  • 8d3412c90c Ignore /vendor/bundle (#1880) Marcin Cieślak 2017-04-18 01:02:50 +02:00
  • 9cefb5731d Add FR locales to the onboarding modal (#1976) Damien Erambert 2017-04-17 16:02:02 -07:00
  • 00a85f31ca Add simplified Chinese js translation (#2044) Mingye Wang 2017-04-17 19:01:32 -04:00
  • 389f8f8249 Instance helper to replace site title helper (#2038) Matt Jankowski 2017-04-17 18:16:32 -04:00
  • e1e15adf1d Updated, improved and fixed Dutch language strings (#2030) jeroenpraat 2017-04-18 00:16:03 +02:00
  • f96f8d0176 Use .presence instead of ternary on site description for og: content (#2033) Matt Jankowski 2017-04-17 17:19:45 -04:00
  • a05e7582e4 optimized logo (#2020) Sam Hewitt 2017-04-17 15:49:51 -04:00
  • fc122e9d78 README tidy up (#2026) Matt Jankowski 2017-04-17 15:28:31 -04:00
  • 7d1e653ec1 Fix import pt_br locale in mastodon.jsx (#2011) Andrey Blinov 2017-04-17 22:01:42 +03:00
  • 7b397b1452 Return early from submit if no text. (#1962) Zac Anger 2017-04-17 12:30:38 -06:00
  • 8fd6552bca French i18n-tasks missing fr (#2018) spf 2017-04-17 20:27:11 +02:00
  • 4ed12cd89a Remove i18n_spec file (#2014) Matt Jankowski 2017-04-17 14:02:29 -04:00
  • cc1361c149 Media controller specs (#2022) Matt Jankowski 2017-04-17 14:02:00 -04:00
  • 15ec4ae07b Fix #1972, fix #1870 - Fix special characters in XML, add tests (#1988) Eugen 2017-04-17 19:58:54 +02:00
  • e43071a2f9 Fix #1897 - Return reblogged: false on unreblog (was wrongly named variable) (#1989) Eugen 2017-04-17 19:58:38 +02:00
  • 21a767dcfa Improve handling of HTTP_ACCEPT for webfinger (#2008) Matt Jankowski 2017-04-17 13:58:03 -04:00
  • 3399dd7a66 Fix nil query_username (#2013) Tomohiro Suwa 2017-04-18 02:57:02 +09:00
  • 630de52fdd Required foreign keys (#2003) alpaca-tc 2017-04-17 22:54:33 +09:00
  • f8546ad5a2 Update Japanese translation (#1993) IWAI, Masaharu 2017-04-17 22:15:24 +09:00
  • 4082e1ac7f Update fr.jsx "clear" (Nettoyer peut-être ambigu) (#1987) Christophe Gesché 2017-04-17 15:15:14 +02:00
  • 6b8e95ea00 Make contents of boost confirmation dialog scroll (#1710) tom 2017-04-17 06:27:19 -04:00
  • e813810e03 Open sidekiq and pghero admin pages in new browser tabs (#1596) Brad Urani 2017-04-17 03:26:45 -07:00
  • ffb99325ca Add gif auto-play/pause preference Patrick Figel 2017-04-17 12:14:03 +02:00
  • fd62d4de10 Add documentation of SMTP_DOMAIN (#1738) Ian Kelling 2017-04-17 01:42:29 -07:00
  • e9eaf9e33c Allow using an SMTP server without authentication (#1597) Miguel Jacq 2017-04-17 18:41:19 +10:00
  • e22f9819bb NFS for shared folder requires a private_network (#1263) happycoloredbanana 2017-04-17 11:40:14 +03:00
  • f3b86c1bda Add mask-icon.svg (#1572) (#1585) Dale Price 2017-04-17 03:39:54 -05:00
  • 833bfd77f2 Added missing rake secret command (#1894) Expenses 2017-04-17 20:38:59 +12:00
  • 6685106daa Add Brazilian Portuguese and fix European Portuguese (#1966) Hugo Gameiro 2017-04-17 09:38:27 +01:00
  • 8ad6722eea Create hr.jsx (#1945) May Kittens Devour Your Soul 2017-04-17 10:38:13 +02:00
  • 548ff54714 Optimize user setting page for mobile browser (#1924) Yuki Nakagawa 2017-04-17 17:37:00 +09:00
  • a67909ec1e Rubocop instructions (#1973) Matt Jankowski 2017-04-17 04:35:42 -04:00
  • 6afe70db95 Add human locales for zh-tw (#1984) Yamagishi Kazutoshi 2017-04-17 17:35:06 +09:00
  • b87a08e160 Add function color remaining text (#1980) usagi-f 2017-04-17 17:34:33 +09:00
  • be6cabb315 Improved Japanese translation in ja.yml (#1981) Toshiyuki Takahashi 2017-04-17 17:32:41 +09:00
  • f8ae12909c Fix tiny typo, and added link to terms and conditions in confirmation email for Japanese. (#1975) (#1975) anon 2017-04-17 17:32:09 +09:00
  • 78bdfc4589 Fix tiny typo (#1956) Ingo Blechschmidt 2017-04-17 10:29:49 +02:00
  • d87ee1167e Assign user locale on signup (#1982) saturday06 2017-04-17 17:29:08 +09:00
  • 64e1d51025 Improve streaming server with cluster (#1970) geta6 2017-04-17 11:32:30 +09:00
  • 7a5086729a reduce unneed query when post without attachements. (#1907) Keiji, Yoshimi 2017-04-17 11:23:13 +09:00
  • 5e94643058 Fix minor typo in Japanese translation "保村" -> "保存" (#1968) Yamagishi Kazutoshi 2017-04-17 11:22:14 +09:00
  • dc6fe4e04b Improved Japanese translation in devise.ja.yml (#1969) Toshiyuki Takahashi 2017-04-17 11:22:09 +09:00
  • 1955a3f444 Do not display "reset password" in admin UI for remote accounts (#1960) Eugen 2017-04-16 23:15:58 +02:00
  • 8ebed7fc68 Fix #1957 - WhatLanguage can return null. Fallback to 'en' (#1959) Eugen 2017-04-16 23:12:19 +02:00
  • 8f2ed79a0b Fix bug mentioned in #1565 (#1954) Eugen 2017-04-16 21:02:54 +02:00
  • 2b6b89491d Remove unused registrations: key from PT yml locale (#1952) Matt Jankowski 2017-04-16 14:53:16 -04:00
  • f902a335f9 Fix #1870 - Strip control characters out of strings in AtomSerializer (#1876) Eugen 2017-04-16 20:32:27 +02:00
  • e4af4898de Add language detection (#1772) Eugen 2017-04-16 20:32:17 +02:00
  • 6d70a80263 Onboarding modal (#1883) Eugen 2017-04-16 20:32:00 +02:00
  • 0cbcc5e297 Update node.js and imagemagick (#1951) Wonderfall 2017-04-16 20:28:25 +02:00
  • f87b51fda8 I18n health warnings (#1949) Matt Jankowski 2017-04-16 13:37:01 -04:00
  • 7e2e0d6dcc Fix #1670 - Update OStatus2 gem (#1936) Eugen 2017-04-16 19:32:47 +02:00
  • 181115422c Disable CodeClimate duplication checks (#1943) Eugen 2017-04-16 18:26:46 +02:00
  • 86d1dcc97a Fix translation of 'reblogged' in eo.yml (#1942) oliverkeeble 2017-04-16 17:11:07 +01:00
  • 86eaaf0761 Add missing keys to PT locale (#1941) Eduardo Elias 2017-04-16 17:04:19 +01:00
  • 19f63ff801 Check @recipient.user at the first (#1939) alpaca-tc 2017-04-17 01:04:05 +09:00
  • babbb2135e Fix #1813 - Alleviate extra requests when processing mentions (#1938) Eugen 2017-04-16 18:01:48 +02:00
  • acd33101c5 Merge branch 'master' into fix/cache_blocking Effy Elden 2017-04-17 01:41:33 +10:00
  • 99226aba93 Adds note for instance admins. (#1925) Ash Furrow 2017-04-16 10:59:53 -04:00
  • 42c9d5111a Add README note about tagged releases (#1927) Eugen 2017-04-16 16:42:46 +02:00
  • e0b5a94a4b Clean up check that account needs a webfinger update (#1932) Matt Jankowski 2017-04-16 10:38:29 -04:00
  • 26ec042f38 Remove trailing whitespace in terms.no.html (#1933) Matt Jankowski 2017-04-16 10:38:13 -04:00
  • 73b0af5c93 Simplify the og:image and og:description code in stream_entries/show (#1934) Matt Jankowski 2017-04-16 10:38:02 -04:00
  • 7efde22c3a Use local vars in partials (#1935) Matt Jankowski 2017-04-16 10:37:49 -04:00
  • 90760eae4c fix regex filter (#1845) abcang 2017-04-16 23:33:38 +09:00
  • fc34e0e191 Remove .keep in models (#1892) tackeyy 2017-04-16 23:28:52 +09:00
  • de72db99fa Add presence validation to Import (#1928) alpaca-tc 2017-04-16 23:28:26 +09:00
  • 77d1447ac4 Add the licence key in package.json (#1914) Alda Marteau-Hardi 2017-04-16 16:08:11 +02:00
  • 2c329f2b69 Fix translation related to "mute" (#1926) mshrtkch 2017-04-16 23:07:58 +09:00
  • c2762fa498 Add missing Japanese translations (#1923) Kazuhiro NISHIYAMA 2017-04-16 23:07:45 +09:00
  • 0611209141 Relax Ruby version requirement (#1901) Akihiko Odaki 2017-04-16 21:57:30 +09:00
  • da302a43cd Improve PT locale on simple_form (#1917) Eduardo Elias 2017-04-16 13:56:04 +01:00
  • 8f8319852c Fixed NoMethodError in UnfollowService (#1918) alpaca-tc 2017-04-16 21:55:43 +09:00
  • 75f416a492 Fix yaml issue in ja locale (#1916) Matt Jankowski 2017-04-16 08:55:04 -04:00
  • 24baaa17e8 Syntax error in japanese localisation (#1920) Naouak 2017-04-16 14:54:09 +02:00
  • c99fc08a0d Add missing french translation. (#1906) Erwan Leboucher 2017-04-16 14:15:03 +02:00
  • a8f45c0838 Enlarge font size to avoid autozooming of iPhone. (#1911) Yuki Nakagawa 2017-04-16 21:05:16 +09:00
  • 6df63465b9 Improve Japanese translation (#1909) George Hattori 2017-04-16 20:44:57 +09:00
  • 13b11ddc8c Add binstub for rspec from rspec-core (#1913) Matt Jankowski 2017-04-16 07:42:45 -04:00
  • f2997c9715 Update Japanese Translate (#1903) 新都心(Neet Shin) 2017-04-16 17:12:16 +05:30
  • e17f9d5e1a Unite all mandatory rake tasks in mastodon:daily (#1887) Eugen 2017-04-16 12:53:58 +02:00
  • 865cb39e9b lock capistrano to 3.8.0 (#1890) Alex Dunn 2017-04-16 03:52:18 -07:00
  • 5d710b1139 Make file attachment on MediaAttachment optional (#1865) Eugen 2017-04-16 12:51:30 +02:00
  • fd81916e86 cache blockings for reducing queries. Keiji Yoshimi 2017-04-15 23:59:39 +09:00
  • 8a58942c80 Fix up recovery codes design a little (#1866) Eugen 2017-04-16 04:32:57 +02:00
  • f97272549c Remove unused gem: coffee-rails (#1885) luigi 2017-04-16 04:02:29 +02:00
  • 363de2dffd Leave out the "Expires" header from S3 uploads (#1886) Joachim Viide 2017-04-16 05:01:58 +03:00
  • 6a1ac9b31f capistrano: allow overriding repo_url and branch (#1889) Alex Dunn 2017-04-15 19:01:27 -07:00
  • 3834e1e69b View spec fix (#1888) Matt Jankowski 2017-04-15 21:40:33 -04:00
  • 95bcbaa434 Fix #1852 - Ensure feeds have valid <title> tags (#1875) Eugen 2017-04-16 02:40:36 +02:00
  • 911338bdcc Show error message if video cannot be loaded (#1879) Isabelle Knott 2017-04-15 19:12:47 -04:00
  • 0f8b7d0660 Removed Heroku in-process spawning. (#1873) Ash Furrow 2017-04-15 17:02:13 -04:00
  • e332552816 Indicate when a toot is part of a chain with a "reply all" icon (#1869) Eugen 2017-04-15 22:48:41 +02:00
  • 0d83569899 Fix cross-origin integrity (#1871) Eugen 2017-04-15 22:48:30 +02:00
  • 515434ed87 English localization for mention notification was missing (#1867) Eugen 2017-04-15 22:48:17 +02:00
  • 3d3e32befb Check for a custom css file to help customization of instances (#1368) Naouak 2017-04-15 22:47:48 +02:00
  • fa08b5079d Make the rake mastodon:users:clear task properly clear out unconfirmed users (#1777) Eugen 2017-04-15 21:55:28 +02:00
  • 00392d3c63 ActiveRecord::NotFound is not defined (#1864) alpaca-tc 2017-04-16 04:17:59 +09:00
  • 28606d730a Fix typo in simple_form.eo.yml (#1848) oliverkeeble 2017-04-15 15:46:48 +01:00
  • 1c8477eab2 Give SINGLE_USER a chance to register (#1820) Marcin Cieślak 2017-04-15 16:46:27 +02:00
  • 6670e6d33f Add password reset for users from admin accounts area (#1841) Matt Jankowski 2017-04-15 10:44:59 -04:00
  • 9d2f55ecc3 Remove isRequired from optional prop (#1843) Henry Smith 2017-04-15 16:44:28 +02:00
  • b7ec2fd492 Fix function call name typo (#1851) Henry Smith 2017-04-15 16:41:22 +02:00
  • 3b8908c114 About page contact email (#1839) Matt Jankowski 2017-04-15 07:33:25 -04:00
  • 7b10794afb Add rails-i18n gem (#1837) Hiromi Kai 2017-04-15 20:32:53 +09:00
  • 355965c17b Silence Devise deprecation warning about TestHelpers (#1840) Matt Jankowski 2017-04-15 07:30:57 -04:00
  • 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