about summary refs log tree commit diff
path: root/config
AgeCommit message (Collapse)Author
2017-04-16Remove unused registrations: key from PT yml locale (#1952)Matt Jankowski
2017-04-16I18n health warnings (#1949)Matt Jankowski
* Rename admin.domain_block to admin.domain_blocks in prep for i18n improvement * Use implicit controller/action path for i18n in admin/domain_blocks * Add DomainBlock#accounts has_many * Avoid i18n health warning for `en` locale by using symbol scope with :count * Remove unused i18n key: plaintext_secret_html * Remove unused i18n key two_factor_auth.warning * Remove final will_paginate i18n keys * Remove unused key two_factor_auth.recovery_codes * Remove unused key: admin.reports.comment.none * Remove unused reports. i18n namespace (moved to admin.reports) * Ignore keys from locales which override activemodel and activerecord errors * Revert "Remove unused key: admin.reports.comment.none" This reverts commit 350ef2685fadc069e619bb6d1066190de195d942. * Update i18n key reference to match moved location * Add missing `en` keys to i18n * Tell i18n-tasks to ignore missing attributes that dont need overwriting * Add i18n-tasks unused to travis
2017-04-16Fix translation of 'reblogged' in eo.yml (#1942)oliverkeeble
2017-04-16Add missing keys to PT locale (#1941)Eduardo Elias
2017-04-16Add missing Japanese translations (#1923)Kazuhiro NISHIYAMA
And `i18n-tasks add-missing -l ja` changes some quotes.
2017-04-16Improve PT locale on simple_form (#1917)Eduardo Elias
* Improve PT locale on simple_form * Add missing keys to PT locale
2017-04-16Fix yaml issue in ja locale (#1916)Matt Jankowski
* Fix yaml parse issue in ja.yml locale * Fix issue in locales/ja.jsx
2017-04-16Improve Japanese translation (#1909)George Hattori
2017-04-16Update Japanese Translate (#1903)新都心(Neet Shin)
* [Update ja.jsx] Add Muted, Video_error and sorted * [Update ja] Added Recovery code's translation * [Update ja] Added Two-fact/Recovery's translation * Update ja.jsx
2017-04-16lock capistrano to 3.8.0 (#1890)Alex Dunn
2017-04-16Make file attachment on MediaAttachment optional (#1865)Eugen
Create MediaAttachment but without actual file download when domain is blocked with reject_media set to true Clean up old media files when creating a new domain block with reject_media set to true Return remote_url in media attachments API if local file is not present Undo domain block action in admin UI Ability to enable reject_media from admin UI
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-15Removed Heroku in-process spawning. (#1873)Ash Furrow
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-15Fix typo in simple_form.eo.yml (#1848)oliverkeeble
2017-04-15Add password reset for users from admin accounts area (#1841)Matt Jankowski
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-15Fix Japanese translation of ja.yml (#1835)Setuu
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 devise.fr.yml (#1792)Olivier Humbert
* Update devise.fr.yml Consistencies across the French translation * Update doorkeeper.fr.yml
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-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-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-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-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-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-14Modify ActionMailer configuration to default to ENV['LOCAL_DOMAIN'] if ↵Effy Elden
ENV['SMTP_DOMAIN'] is not set. The previous fallback, config.x.local_domain, is undefined when the code is called. (#1745)
2017-04-13Fix italian translationEugen Rochko
2017-04-13Merge branch 'master' of git://github.com/matteoaquila/mastodon into ↵Eugen Rochko
matteoaquila-master
2017-04-13Make browserify respect changes in node_modules for asset compilation (#1722)Eugen
2017-04-13Update devise.it.ymlMatteo Aquila
2017-04-13Update devise.it.ymlMatteo Aquila
2017-04-13Make boost modal off by default (#1719)Eugen
2017-04-13Add filename extension to paperclip (#1718)Yusuke Abe
2017-04-13Use english in reported by translation (#1713)Matt Jankowski
2017-04-13Fr missing strings (#1708)spf
* Fix missing translation for username already taken * fr - note too long translation
2017-04-13Translate admin (#1702)Thomas Citharel
* 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
2017-04-13smtp delivery type fix (#1556)James Moore
* delivery fix # Conflicts: # config/environments/production.rb * added stub in .env file * reordered and added a comment
2017-04-13Apply `i18n-tasks normalize` to locales (#1696)Eugen
2017-04-13Add Dutch translation (nl) (#1682)Koala Yeung
* 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
2017-04-13Update application.rbMatteo Aquila
generated by cgit-pink (git 2.37.1) at 2024-11-26 00:13:41 +0000