about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-04-16Leave out the "Expires" header from S3 uploads (#1886)Joachim Viide
2017-04-16capistrano: allow overriding repo_url and branch (#1889)Alex Dunn
2017-04-16View spec fix (#1888)Matt Jankowski
* Add option to disable verify partial doubles * Add show_landing_strip? helper method * Use show_landing_strip? helper in accounts and stream entries views * Fix naming in view specs
2017-04-16Fix #1852 - Ensure feeds have valid <title> tags (#1875)Eugen
2017-04-16Show error message if video cannot be loaded (#1879)Isabelle Knott
2017-04-15Removed Heroku in-process spawning. (#1873)Ash Furrow
2017-04-15Indicate when a toot is part of a chain with a "reply all" icon (#1869)Eugen
2017-04-15Fix cross-origin integrity (#1871)Eugen
See <https://glitch.social/users/bea/updates/434>
2017-04-15English localization for mention notification was missing (#1867)Eugen
2017-04-15Check for a custom css file to help customization of instances (#1368)Naouak
* User can create a custom.scss to customize their instance without modifying gitted files. * Add documentation for customization. * Forgot the helper file * Fix Style to pass codeclimate * Requests from maintainer.
2017-04-15Make the rake mastodon:users:clear task properly clear out unconfirmed users ↵Eugen
(#1777) Before it cleared out user records only (e-mail, password) without freeing up the associated username (account record). Furthermore, since these records have no dependent records (due to no user activity) they can be deleted quickly with delete_all instead of destroy
2017-04-15ActiveRecord::NotFound is not defined (#1864)alpaca-tc
2017-04-15Fix typo in simple_form.eo.yml (#1848)oliverkeeble
2017-04-15Give SINGLE_USER a chance to register (#1820)Marcin Cieślak
An attempt to open a brand new Mastodon instance configured as SINGLE_USER_MODE=true will cause an exception. Enable temporary registration if we have no users in the database Fixes #1817
2017-04-15Add password reset for users from admin accounts area (#1841)Matt Jankowski
2017-04-15Remove isRequired from optional prop (#1843)Henry Smith
2017-04-15Fix function call name typo (#1851)Henry Smith
2017-04-15About page contact email (#1839)Matt Jankowski
* Correct site_contact_email typo * Separate about more page into partials, add specs
2017-04-15Add rails-i18n gem (#1837)Hiromi Kai
2017-04-15Silence Devise deprecation warning about TestHelpers (#1840)Matt Jankowski
Devise changed their approach - https://github.com/plataformatec/devise/commit/3f3ec236bb50a2ae8b0eede90d8f7ecd201d7dbb This change silences a deprecation warning about `TestHelpers`
2017-04-15views/about: use Setting.site_title instead of hardcoding (#1508)Alex Dunn
2017-04-15Add eslint-plugin-jsx-a11y (#1651)Zac Anger
* Add eslint-plugin-jsx-a11y. * Fix npm script. * Adjust npm scripts so test also runs lint. * Fix existing lint errors. * Don't break on a11y issues. * Add role and tabIndex. * Add vim and Mac files to .gitignore and .dockerignore. * Handle htmlFor (partially), a that's actually a button. * Fix missing tabIndex. * Add cursor:pointer to load-more * Revert change to load_more. * Fixes based on review. * Update yarn.lock. * Don't try to install fsevents on Linux (hides warning noise).
2017-04-15Add recovery code support for two-factor auth (#1773)Patrick Figel
* Add recovery code support for two-factor auth When users enable two-factor auth, the app now generates ten single-use recovery codes. Users are encouraged to print the codes and store them in a safe place. The two-factor prompt during login now accepts both OTP codes and recovery codes. The two-factor settings UI allows users to regenerated lost recovery codes. Users who have set up two-factor auth prior to this feature being added can use it to generate recovery codes for the first time. Fixes #563 and fixes #987 * Set OTP_SECRET in test enviroment * add missing .html to view file names
2017-04-15Add some missing Spanish translations (#1818)luigi
* Add missing spanish translations on user settings simple_form.es.yml * Fix typo: Aute/ción. should be Autenticación
2017-04-15Update ja.jsx (#1822)Amakasu Ryoma
* Add getting_started.apps * Add search_results.total * Fix notifications.settings
2017-04-15Fix Japanese translation of ja.yml (#1835)Setuu
2017-04-15Add a classname to the loading bar (#1826)Alda Marteau-Hardi
2017-04-15fixed privacy mistake of japanese translation of privacy.change (#1832)Keiji, Yoshimi
2017-04-15Add tasks for open/close registration (#1823)Andrew
* Add tasks for open/close registration * Code climate style fix * Use true instead of string 'true'
2017-04-15ActiveRecord::Relation does not respond to `#id` (#1834)alpaca-tc
2017-04-15Account search service refactor (#1791)Matt Jankowski
* Begin coverage for account search service * Coverage for hashtag query * Coverage for calling local vs remote find based on domain presence * Spec to check that exact matches are not duped * Coverage of resolve option * Coverage for account being provided * Start to refactor account search service * Isolate query username and domain methods * Isolate exact_match method * Extract methods for local and remote results * Simplify local vs remote and account isoliation * Extract methods for local and remote results * Simplify de-dupe of exact match * Simplify logic to check for non exact remotes * Cache some methods * Remove nil from exact_match from results array * Return exact matches first * Use find_remote even with no domain Account.find_local is just an alias for Account.find_remote(user, nil) - so we can not bother with the conditional here, and call find_remote directly.
2017-04-15Refresh webfinger (#1323)ThibG
* Refresh local info for remote accounts when webfinger returns new values It only refreshes account info if one of the URLs or the public-key changes, in which cases it refreshes the full info, re-downloading the feeds from that user. Some special handling should probably be done when the public key changes, but I have been unable to find any use for it in Mastodon yet. * Re-fetch remote users we aren't subscribed to. This might induce performance issues, we might want to only do that for users we explicitly attempted to subscribe but failed to. * Refactor changes * Do not refresh existing remote account details more than once a day * Avoid re-fetching webfinger info in tests unless otherwise specified
2017-04-15Rename admin/accounts_helper to admin/filter_helper (#1816)Matt Jankowski
- Add some spec coverage for both methods - Add explicit constant call-outs for where the params are from
2017-04-15jslint: fix jslint warnings (#1704)Koala Yeung
* jslint: remove trailing space * jslint: fix no-nested-ternary issue Follow the jslint [no-nested-ternary](http://eslint.org/docs/rules/no-nested-ternary) rule. Rewritten ternary with if-then.
2017-04-15Update devise.fr.yml (#1728)goofy-bz
Very light grammar fix to improve gender-neutral
2017-04-15Add translations for zh-TW (Taiwan) (#1794)Shouko Yu
2017-04-15Update Traditional Chinese, HK (zh-HK) translation (#1759)Koala Yeung
* Fix missing string in javascript locale (zh-HK) * Change javascript locale (zh-HK) * Fix some other strings that were still English. * Improve `search.status_by`. * Fix `notification.follow`. ("開始開始你") * Changes according to user feedback. * "Back": "較前顯示" -> "返回" * "Home": "家" -> "主頁" * Update ruby locale (zh-HK) * Fix missing translation * Normalize yml * Update translation strings
2017-04-15Update nl.yml (#1764)Fjoerfoks
Some rewording, typos and switching to infinitve
2017-04-15Update nl.jxs (#1766)Fjoerfoks
Some rewording and switching to infinitive localization.
2017-04-15Update devise.fr.yml (#1792)Olivier Humbert
* Update devise.fr.yml Consistencies across the French translation * Update doorkeeper.fr.yml
2017-04-15Update Russian translation (#1733)Ratmir Karabut
* Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error * Update Russian translation * Fix formatting error
2017-04-15Use site title on tags#show page (#1802)Matt Jankowski
2017-04-15add basic microformats tests (#1803)Ben Roberts
as suggested, moving to view tests rather than a controller test replaces https://github.com/tootsuite/mastodon/pull/1786 which i will close momentary
2017-04-15More Norwegian translations (#1805)Thor Harald Johansen
* Working translation for Norwegian. * Fixes to Norwegian translation. * Further adjustments to Norwegian translation. * Further adjustments to Norwegian translation. * Yet more improvements to the Norwegian translation. * More Norwegian translations. Better terminology.
2017-04-15Send initial state in a <script type="application/json"> tag (#1806)Joachim Viide
2017-04-15Mispelling & minor fixes (#1814)Darío Hereñú
2017-04-15Remove unused will_paginate.page_gap key from i18n (#1815)Matt Jankowski
This value was changed recently, and every locale which had it set was using the same value as the default. This value is still the default in the new location.
2017-04-15[css] reduce spacing between text elements on about pages (#1510)Alex Dunn
2017-04-15Polish translation (needs more love though) (#807)rysiekpl
* Polish translation (needs more love though) * Polish translation bugfix * bugfix for new colon-containing texts * another bugfix. yaml is evil * minor fix * fixing issues pointed out by reviewers * Uwierzytelnianie dwustopniowe -> dwuetapowe, as suggested by a reviewer * Etyczny dizajn zbyt sarkastyczny, to będą założenia
2017-04-15Add REDIS_DB env variable to configure Redis database (#1366)Les Orchard