about summary refs log tree commit diff
AgeCommit message (Collapse)Author
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
2017-04-15Allow running mastodon on a different domain as the one used for identifying ↵ThibG
users (#1267) * Allow running mastodon on a different domain as the one used for identifying users * Alter documentation of WEB_DOMAIN to make clear it shouldn't be used unless the admin knows what they are doing * Compare to web_domain instead of local_domain when dealing with feeds/API * Correctly identify mentions to local accounts Mentions URLs point to the person's web profile, i.e., the user page served on WEB_DOMAIN.
2017-04-15Use image too in docker-compose (#1109)Pierre Ozoux
* Use image too in docker-compose It is possible with version 2 of compose to use both `build` and `image` * Update docker-compose.yml
2017-04-15Custom Paperclip path. (#778)Valentin Lorentz
* Custom Paperclip path. * Document PAPERCLIP_ROOT. * Add PAPERCLIP_ROOT_URL (and rename PAPERCLIP_ROOT to PAPERCLIP_ROOT_PATH).
2017-04-15update Node to 6.x LTS (#1228)Alex Dunn
The 4.x branch [entered maintenance](https://github.com/nodejs/LTS#lts-schedule1) on 1 April.
2017-04-15Add list of muted user to UI and Getting Started (#1799)Patrick Figel
Add the same UI that already exists for blocked users for muted ones and add it to the "Getting Started" menu.
2017-04-15Introduce capybara and first feature spec (#1801)Chad Pytel
This commit introduces Capybara and the first feature spec. I focused on coverage for log in for the first feature spec because that would have prevented 624a9a7136159d460228a0c2f5df18a9ead3b7f2 causing #1236.
2017-04-15Improve i18n chooser (#1804)Matt Jankowski
* Add locale spec with failing locale plus region check * Use a more accurate locale when supplied by browser headers Previously we were using a matching option which would use the first locale available which matched the locale portion, even if a region was specified. This changes to first try to find an exact match, and then fall back to the region, and then fall back to the default. * Clean up default_locale method
2017-04-14Remove current directory from PATH (#1779)Kazuhiro NISHIYAMA
2017-04-14Add missing Japanese translations (#1785)Kazuhiro NISHIYAMA
2017-04-14Fix Japanese translation for remote_follow (#1771)Takayuki KUSANO
Current remote_follow.acct translation inappropriate. Users may input their own acccount. So fix the wording.
2017-04-14Add title attribute to URLs in statuses (#1755)Luc Didry
Since URLs in statuses are truncated, it would be pleasant to see the full URL when hovering the URL (like on twitter, yes).
2017-04-14Fix invalid byte sequence issue in nl.jsx (#1751)Matt Jankowski
2017-04-14Change usage of gsub to delete, as per Code Climate/Rubocop recommendation ↵Effy Elden
(#1753)
2017-04-14Remove .keep in models (#1748)西小倉宏信
2017-04-14Include pkg-config as a gem dependency. (#1717)Bryce Chidester
The pkg-config gem was necessary in order for nokogiri to find the system libraries when building on OpenBSD. Closes #1637 Signed-off-by: Bryce Chidester <bryce@cobryce.com>
2017-04-14Use landmark regions on columns (#1732)JP DeVries
Closes mastodon#1720
2017-04-14Admin reports controller improvements (#1714)Matt Jankowski
* Simplify admin/reports controller filtering for index * Rename parameter to resolved * Fix issue where reports view could not access filter_link_to * Add coverage for admin/reports controller * DRY up resolution of related reports for target account * Clean up admin/reports routes * Add Report#statuses method * DRY up current account action taken params * Rubocop styles
2017-04-14Implementing Subresource Integrity (#1729)maxypy
* Add sprockets-rails to Gemfile * Add sprockets-rails to Gemfile.lock * Update show.html.haml * Update index.html.haml * Update admin.html.haml * Update auth.html.haml * Update embedded.html.haml * Update public.html.haml