about summary refs log tree commit diff
path: root/config
AgeCommit message (Collapse)Author
2017-04-20Send nil for SMTP_LOGIN or SMTP_PASSWORD if it was left blank in the ↵Miguel Jacq
envfile, otherwise Ruby still attempts auth even if SMTP_AUTH_METHOD is none (#2180)
2017-04-19Extract error messages to locale file (#2162)alpaca-tc
2017-04-19capistrano: link robots.txt (#1576)Alex Dunn
Related to #1533.
2017-04-19Make configuarable s3_permissions for paperclip (#2139)tmyt
2017-04-19Change to switch signature version for Amazon S3 (#2124)Yamagishi Kazutoshi
2017-04-19Restful refactor of accounts/ routes (#2133)Matt Jankowski
* Add routing specs for accounts followers and following actions * Use more restful route naming for public account follow pages Moves two actions: - accounts#followers to accounts/follower_accounts#index - accounts#following to accounts/following_accounts#index Adds routing spec to ensure prior URLs are preserved.
2017-04-19update simple_form.ja.yml (follow for #1991) (#2113)Isao Sugimoto
2017-04-19update ja.yml (follow for #2106) (#2109)Isao Sugimoto
2017-04-19Update fr.yml (#2107)Michel
Just updated some values. Best regards, cyweo
2017-04-18Fix wording on admin instances view, fix typos in language detector spec (#2106)Eugen
2017-04-18Fix #1642, fix #1912 - Dictate content-type file extension (#2078)Eugen
* Fix #1642, fix #1912 - Previous change (#1718) did not modify how original file was saved on upload * Fix for when file is missing
2017-04-18missing translate ja.yml (#2100)Isao Sugimoto
2017-04-18Add rate limits for logins and sign-ups by IP (5 in 5 minutes) (#2079)Eugen
* Add rate limits for logins and sign-ups by IP (5 in 5 minutes) Should be enough for normal attempts * Add rate limit for forgotten password form as well
2017-04-18Instances list in admin (#2095)Matt Jankowski
* Add admin/instances index action * Add link to instances admin page * View lists instances * Instances, grouped by domain, ordered by count * Use Account.remote scope * Extract method: Account.by_domain_accounts
2017-04-18Admin reports with accounts (#2092)Matt Jankowski
* Add a ReportFilter class * Add reports and targeted_reports relationships to Account * Use ReportFilter from admin/reports controller * Link to admin/reports filtered views from admin account show view * Add indexes to reports.account_id and reports.target_account_id
2017-04-18French translation update (#2063)Olivier Humbert
fixes
2017-04-18Add Occitan (oc) translation (#2077)Koala Yeung
* Added oc.yml * Added `config/locales/oc.yml`. Translated in General Occitan (Quent-in). * Added oc.jsx (Occitan translation) * Written in General Occitan (lengadocian) * Added `app/assets/javascripts/components/locales/oc.js` * Added doorkeeper.oc.yml * Added `config/locales/doorkeeper.oc.yml` (Quent-in) * Added simple_form.oc.yml * Added `config/locales/simple_form.oc.yml` (Quent-in). * Merge en.yml changes into oc.yml Added new strings for translations * Fix typo in oc.yml * Update javascript locale support (oc) * Update ruby locale list (oc) * Fix oc.yml * Remove obsoleted translations * Moved old translation of `reports` to `admin.reports`
2017-04-18Update Russian translation (#1967)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 * Update Russian translation * Update Russian translation * Update ru.jsx * Fix syntax error * Remove two_factor_auth.warning (appears obsolete) * Add missing strings in ru.yml A lot of new strings translated, especially for the newly added admin section * Fix translation consistency
2017-04-18Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gifEugen Rochko
2017-04-18Updated, improved and fixed Dutch language strings (#2030)jeroenpraat
* Fixed some words * Improved and more consistent * Fixes and a bit less 'je' * Improved and more consistent * Another round of improvements and consistency * More improvements and less 'je' * Update * Updated with admin strings * More improvements and additions - not complete yet, but most is there * This is what we call in Dutch 'the English disease' :-) * fix comma * admin.reportsi * not needed * hopefully now fixed
2017-04-17French i18n-tasks missing fr (#2018)spf
2017-04-17Improve handling of HTTP_ACCEPT for webfinger (#2008)Matt Jankowski
This change includes: - Improve the spec coverage for incoming request to the webfinger action - For requests without an accept header (ie, what a browser might look like), return a JSON response. - For requests with an explicit format of xml or json, return that format. - For requests using an accept header, return that format. Also adds failing spec showing webfinger does not return xml, which covers the issue described in: https://github.com/tootsuite/mastodon/issues/1983
2017-04-17Update Japanese translation (#1993)IWAI, Masaharu
Sync text for toot form
2017-04-17Open sidekiq and pghero admin pages in new browser tabs (#1596)Brad Urani
* Open sidekiq and pghero admin pages in new tabs * Add missing comma
2017-04-17Add gif auto-play/pause preferencePatrick Figel
This introduces a new per-user preference called "Auto-play animated GIFs", which is enabled by default. When a user disables this setting, gifs in toots become click-to-play. Previews of animated gifs were changed to display the video play button so that users can distinguish them from regular images. This setting also affects account avatars in the detailed account view, which was changed to use the same hover-to-play mechanism that is used for animated avatars in timelines. Fixes #1652
2017-04-17Allow using an SMTP server without authentication (#1597)Miguel Jacq
* Allow using an SMTP server without authentication (e.g Postfix relay on the same host) by setting SMTP_LOGIN and SMTP_AUTH_METHOD to 'none' * Add note in .env.production.sample about SMTP settings for servers where no auth is required * Assume that SMTP_LOGIN and SMTP_PASSWORD will be blank if we set SMTP_AUTH_METHOD to none
2017-04-17Add Brazilian Portuguese and fix European Portuguese (#1966)Hugo Gameiro
* update portuguese translation added the missing fields and improved the translation * pt translations fix * improve last translation commit * fix damn quotes * add pt_br to index.jsx * add pt-BR to import index.jsx * add pt-BR to mastodon.jsx * add pt-BR to settings_helper.rb * add pt-BR to application.rb * order alphabetically pt.jsx * create pt-BR.jsx * Create devise.pt-BR.yml * language improvements to devise.pt.yml * created doorkeeper.pt-BR.yml * fixes to doorkeeper.pt.yml * create pt-BR.yml * improvements to pt.yml * Create simple_form.pt-BR.yml * Improvements to simple_form.pt.yml * improvements to pt.yml
2017-04-17Create hr.jsx (#1945)May Kittens Devour Your Soul
* Create hr.jsx Start of Croatian translation * Update settings_helper.rb * Update application.rb * Update application.rb * Update index.jsx
2017-04-17Improved Japanese translation in ja.yml (#1981)Toshiyuki Takahashi
2017-04-17Fix tiny typo (#1956)Ingo Blechschmidt
2017-04-17Fix minor typo in Japanese translation "保村" -> "保存" (#1968)Yamagishi Kazutoshi
2017-04-17Improved Japanese translation in devise.ja.yml (#1969)Toshiyuki Takahashi
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