455 Commits (8a58942c80275788cbe069f2d67c396732ec092d)

Author	SHA1	Message	Date
Joachim Viide	363de2dffd	Leave out the "Expires" header from S3 uploads (#1886)	8 years ago
Alex Dunn	6a1ac9b31f	capistrano: allow overriding repo_url and branch (#1889)	8 years ago
Ash Furrow	0f8b7d0660	Removed Heroku in-process spawning. (#1873)	8 years ago
Naouak	3d3e32befb	Check for a custom css file to help customization of instances (#1368) ... * 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.	8 years ago
oliverkeeble	28606d730a	Fix typo in simple_form.eo.yml (#1848)	8 years ago
Matt Jankowski	6670e6d33f	Add password reset for users from admin accounts area (#1841)	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
Setuu	9e620ca16c	Fix Japanese translation of ja.yml (#1835)	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
Olivier Humbert	061922b38c	Update devise.fr.yml (#1792) ... * Update devise.fr.yml Consistencies across the French translation * Update doorkeeper.fr.yml	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
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
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
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
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
Matt Jankowski	8b74aa4217	Admin reports controller improvements (#1714) ... * 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	8 years ago
Effy Elden	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)	8 years ago
Eugen Rochko	c8be05a4a7	Fix italian translation	8 years ago
Eugen Rochko	41c697fd81	Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master	8 years ago
Eugen	485310a43c	Make browserify respect changes in node_modules for asset compilation (#1722)	8 years ago
Matteo Aquila	9aae9ae40c	Update devise.it.yml	8 years ago
Matteo Aquila	1fb125b630	Update devise.it.yml	8 years ago
Eugen	057567d548	Make boost modal off by default (#1719)	8 years ago
Yusuke Abe	169c68a739	Add filename extension to paperclip (#1718)	8 years ago
Matt Jankowski	9f182346d7	Use english in reported by translation (#1713)	8 years ago
spf	a58c935c3d	Fr missing strings (#1708) ... * Fix missing translation for username already taken * fr - note too long translation	8 years ago
Thomas Citharel	c0c56db0fa	Translate admin (#1702) ... * Translate the domain_block panel Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Translate PubSubHubbub section Signed-off-by: Thomas Citharel <tcit@tcit.fr> * translate account section and correct typos * move reports translation & translate sidebar Signed-off-by: Thomas Citharel <tcit@tcit.fr> * normalize l18n	8 years ago
James Moore	d9dc0fe84e	smtp delivery type fix (#1556) ... * delivery fix # Conflicts: # config/environments/production.rb * added stub in .env file * reordered and added a comment	8 years ago
Eugen	9e5c1c487e	Apply `i18n-tasks normalize` to locales (#1696)	8 years ago
Koala Yeung	1206627c59	Add Dutch translation (nl) (#1682) ... * Dutch language files for Ruby code * Created RoR translation ymls: * config/locales/devise.nl.yml * config/locales/doorkeeper.nl.yml * config/locales/nl.yml * config/locales/simple_form.nl.yml * Modified RoR config and helper * app/helpers/settings_helper.rb * config/application.rb * Dutch language javascript locale * Created javascript locale files: * app/assets/javascripts/components/locales/index.jsx * app/assets/javascripts/components/locales/nl.jsx * Reference the newly created locale files: * app/assets/javascripts/components/containers/mastodon.jsx * Fix syntax error in locale file (nl) * Fix missing translate in js locale (nl) * Convert all ruby Dutch locale (nl) file to utf8 Fix yml conversion issues. * Fix duplicated key in devise.nl.yml * Fix indentation error in doorkeeper.nl.yml	8 years ago
Matteo Aquila	0220f3a171	Update application.rb	8 years ago
Matteo Aquila	3f42ad7d1a	Rename simple_form.it.yml to config/locales/simple_form.it.yml	8 years ago
Matteo Aquila	f7c466c8d8	Rename devise.it.yml to config/locales/devise.it.yml	8 years ago
Matteo Aquila	245b9cb4ba	Rename doorkeeper.it.yml to config/locales/doorkeeper.it.yml	8 years ago
Matteo Aquila	9275f92972	Rename it.yml to config/locales/it.yml	8 years ago
Musee U	467d32fce3	[l10n] ja: update missing Japanese translations (#1684)	8 years ago
May Kittens Devour Your Soul	90d0018fd5	Adds Croatian language [Hrvatski] (#1000) ... * Create simple.form.hr.yml * Create hr.yml * Update hr.yml * Update hr.yml * Create doorkeeper.hr.yml * Create devise.hr.yml	8 years ago
新都心(Neet Shin)	0e4479bb3a	Update Japanese translation files (#1640) ... * [l10n] ja: Improve Japanese Translations * ja: about: Fix highlighting * ja: Update Translations * ja: Translate admin settings Signed-off-by: lindwurm <lindwurm.q@gmail.com> * Update ja.jsx * Update doorkeeper.ja.yml * Update ja.yml * Update ja.jsx * Update ja.jsx	8 years ago
Ratmir Karabut	af7e880df5	Update Russian translation (#1570) ... * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error	8 years ago
Svetlozar Todorov	aa7bf1515c	Fix #624 - Add localization for Bulgarian (#645) ... * Add translation files and declarations for Bulgarian * Add a bunch of translations to bg.jsx * Add rest of translations to bg.jsx * Add devise translations * Fix devise translations	8 years ago
Matt Jankowski	137100dcf3	Clean up well-known routes/controllers (#1649) ... * Add request spec for host meta route returning xml * Add routing spec for xrd routes * Update well-known routes * Move webfinger and host-meta actions to their own controllers	8 years ago
Matt Jankowski	3a9eb81a80	Admin accounts controller cleanup (#1664) ... * Remove unused account_params method in admin/accounts controller * Introduce AccountFilter to find accounts * Use AccountFilter in admin/accounts controller * Use more restful routes admin silence and suspension area * Add admin/silences and admin/suspensions controllers	8 years ago