2252 Commits (b7ec2fd4924dc186acc9205044d1539f1e267e0e)

 

All Branches   

Search

Author	SHA1	Message	Date
Henry Smith	b7ec2fd492	Fix function call name typo (#1851)	8 years ago
Matt Jankowski	3b8908c114	About page contact email (#1839) ... * Correct site_contact_email typo * Separate about more page into partials, add specs	8 years ago
Hiromi Kai	7b10794afb	Add rails-i18n gem (#1837)	8 years ago
Matt Jankowski	355965c17b	Silence Devise deprecation warning about TestHelpers (#1840) ... Devise changed their approach - 3f3ec236bb This change silences a deprecation warning about `TestHelpers`	8 years ago
Alex Dunn	0f889523e4	views/about: use Setting.site_title instead of hardcoding (#1508)	8 years ago
Zac Anger	f4045ba3d9	Add eslint-plugin-jsx-a11y (#1651) ... * 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).	8 years ago
Patrick Figel	df4ff9a8e1	Add recovery code support for two-factor auth (#1773) ... * 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	8 years ago
luigi	67ad84b7eb	Add some missing Spanish translations (#1818) ... * Add missing spanish translations on user settings simple_form.es.yml * Fix typo: Aute/ción. should be Autenticación	8 years ago
Amakasu Ryoma	f0f6a3279a	Update ja.jsx (#1822) ... * Add getting_started.apps * Add search_results.total * Fix notifications.settings	8 years ago
Setuu	9e620ca16c	Fix Japanese translation of ja.yml (#1835)	8 years ago
Alda Marteau-Hardi	bddd36f260	Add a classname to the loading bar (#1826)	8 years ago
Keiji, Yoshimi	b857551617	fixed privacy mistake of japanese translation of privacy.change (#1832)	8 years ago
Andrew	e28a5aab08	Add tasks for open/close registration (#1823) ... * Add tasks for open/close registration * Code climate style fix * Use true instead of string 'true'	8 years ago
alpaca-tc	f9d7ec8971	ActiveRecord::Relation does not respond to `#id` (#1834)	8 years ago
Matt Jankowski	40fd1de488	Account search service refactor (#1791) ... * 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.	8 years ago
ThibG	31f0bcf804	Refresh webfinger (#1323) ... * 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	8 years ago
Matt Jankowski	09540192c9	Rename admin/accounts_helper to admin/filter_helper (#1816) ... - Add some spec coverage for both methods - Add explicit constant call-outs for where the params are from	8 years ago
Koala Yeung	08059ddda9	jslint: fix jslint warnings (#1704) ... * 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.	8 years ago
goofy-bz	a3aa9381c4	Update devise.fr.yml (#1728) ... Very light grammar fix to improve gender-neutral	8 years ago
Shouko Yu	120a37a197	Add translations for zh-TW (Taiwan) (#1794)	8 years ago
Koala Yeung	ec9999cdfe	Update Traditional Chinese, HK (zh-HK) translation (#1759) ... * 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	8 years ago
Fjoerfoks	e806d3c3f0	Update nl.yml (#1764) ... Some rewording, typos and switching to infinitve	8 years ago
Fjoerfoks	4ba6acd518	Update nl.jxs (#1766) ... Some rewording and switching to infinitive localization.	8 years ago
Olivier Humbert	061922b38c	Update devise.fr.yml (#1792) ... * Update devise.fr.yml Consistencies across the French translation * Update doorkeeper.fr.yml	8 years ago
Ratmir Karabut	5d8d827436	Update Russian translation (#1733) ... * 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	8 years ago
Matt Jankowski	cde1f37d93	Use site title on tags#show page (#1802)	8 years ago
Ben Roberts	89707ad0ac	add basic microformats tests (#1803) ... as suggested, moving to view tests rather than a controller test replaces https://github.com/tootsuite/mastodon/pull/1786 which i will close momentary	8 years ago
Thor Harald Johansen	4bebeb27d3	More Norwegian translations (#1805) ... * 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.	8 years ago
Joachim Viide	ef879a8839	Send initial state in a <script type="application/json"> tag (#1806)	8 years ago
Darío Hereñú	9240ca6cef	Mispelling & minor fixes (#1814)	8 years ago
Matt Jankowski	619817d29e	Remove unused will_paginate.page_gap key from i18n (#1815) ... 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.	8 years ago
Alex Dunn	0655f16cc1	[css] reduce spacing between text elements on about pages (#1510)	8 years ago
rysiekpl	ade004b5ee	Polish translation (needs more love though) (#807) ... * 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	8 years ago
Les Orchard	7609593e48	Add REDIS_DB env variable to configure Redis database (#1366)	8 years ago
ThibG	a9529d3b4b	Allow running mastodon on a different domain as the one used for identifying 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.	8 years ago
Pierre Ozoux	0d2910478a	Use image too in docker-compose (#1109) ... * Use image too in docker-compose It is possible with version 2 of compose to use both `build` and `image` * Update docker-compose.yml	8 years ago
Valentin Lorentz	5ab0ffc6c8	Custom Paperclip path. (#778) ... * Custom Paperclip path. * Document PAPERCLIP_ROOT. * Add PAPERCLIP_ROOT_URL (and rename PAPERCLIP_ROOT to PAPERCLIP_ROOT_PATH).	8 years ago
Alex Dunn	8482f67caf	update Node to 6.x LTS (#1228) ... The 4.x branch [entered maintenance](https://github.com/nodejs/LTS#lts-schedule1) on 1 April.	8 years ago
Patrick Figel	fe8dd58bc1	Add list of muted user to UI and Getting Started (#1799) ... Add the same UI that already exists for blocked users for muted ones and add it to the "Getting Started" menu.	8 years ago
Chad Pytel	92cd207c50	Introduce capybara and first feature spec (#1801) ... 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 624a9a7136 causing #1236.	8 years ago
Matt Jankowski	f5cd138323	Improve i18n chooser (#1804) ... * 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	8 years ago
Kazuhiro NISHIYAMA	66ea015a01	Remove current directory from PATH (#1779)	8 years ago
Kazuhiro NISHIYAMA	1616cf98a1	Add missing Japanese translations (#1785)	8 years ago
Takayuki KUSANO	5aae6384ff	Fix Japanese translation for remote_follow (#1771) ... Current remote_follow.acct translation inappropriate. Users may input their own acccount. So fix the wording.	8 years ago
Luc Didry	fa89deb4eb	Add title attribute to URLs in statuses (#1755) ... Since URLs in statuses are truncated, it would be pleasant to see the full URL when hovering the URL (like on twitter, yes).	8 years ago
Matt Jankowski	26a892dd90	Fix invalid byte sequence issue in nl.jsx (#1751)	8 years ago
Effy Elden	8321884eef	Change usage of gsub to delete, as per Code Climate/Rubocop recommendation (#1753)	8 years ago
西小倉宏信	290e8ef854	Remove .keep in models (#1748)	8 years ago
Bryce Chidester	067eb220c6	Include pkg-config as a gem dependency. (#1717) ... 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>	8 years ago
JP DeVries	1467515d3d	Use landmark regions on columns (#1732) ... Closes mastodon#1720	8 years ago