about summary refs log tree commit diff
path: root/config
AgeCommit message (Collapse)Author
2017-07-08Update and improvement Dutch language strings (#4117)Jeroen
* Update * Update
2017-07-08Various fixes in the French translation (#4107)Sylvhem
* Changement de « Changement de mot de passe » en « Sécurité » * Suppression de « (Two-factor auth) » Change la valeur de la chaîne « two_factor_authentication » de « Identification à deux facteurs (Two-factor auth) » à « Identification à deux facteurs ». La traduction anglaise entre parathentèse était redondante et gênait la lecture. Change the value of the "two_factor_authentication" from "Identification à deux facteurs (Two-factor auth)" to "Identification à deux facteurs". The English translation in brackets was superflous and was getting in the way of the reader. * Remplace « ' » par « ’ » Retire de la traduction les apostrophes droites « ' » (U+0027) au profit des apostrophes typographiques « ’ » (U+2019). En typographie française, les apostrophes typographiques sont utilisées à la place des apostrophes droites. La traduction était jusqu’ici incohérente et utilisait les deux. Remove from the translation all the vertical apostrophes (U+0027) in favor of the curly ones (U+2019). In French typography, typographic apostrophes are used instead of vertical ones. The translation was incoherent and used both. * Remplace « ... » par « … » Remplace les séries de trois points par le caractère dédié « … » (U+2026). Replace all the series of three dots by the dedicated character "…" (U+2026). * Mise à jour Crée config/locales/activerecord.fr.yml, ajoute de nouvelles chaînes et met à jour certains textes. Les compteurs de caractères pour le pseudonyme et la biographie devrait maintenant pouvoir fonctionner même quand l’interface est en français. Create config/locales/activerecord.fr.yml, add new strings et update some textes. The caracters counters for the username and the biography should now work even when the interface is in French. * Remplace « A » par « À » Remplace « A » par « À » aux endroits où le mot est mal orthographié. Replace "A" by "À" when the wrong word is used. * Ajout d’espaces insécables Ajoute des espaces insécables suivant les régles nécessaires en typographie française. Add non-breaking spaces following rules of French typography. * Remplace « certain » par « certain·e » Harmonise la traduction en remplaçant « certain » par sa forme épicène. Harmonize the translation by replacing "certain" (sure) by its epicene form. * Corrige un angliscisme Remplace « adresse e-mail » par « adresse électronique ». Replace "adresse e-mail" (e-mail address) by "adresse électronique" (electronic address).
2017-07-07Fix #4058 - Use a long-lived cookie to keep track of user-level sessions (#4091)Eugen Rochko
* Fix #4058 - Use a long-lived cookie to keep track of user-level sessions * Fix tests, smooth migrate from previous session-based identifier
2017-07-07i18n: improve consistency (pl) (#4104)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-07-07i18n: @18d3fa9 (pl) (#4101)m4sk1n
2017-07-07Add recursive object support to API response (#4095)Yamagishi Kazutoshi
2017-07-07Set default From address in config (#3756)Akihiko Odaki (@fn_aki@pawoo.net)
The old implementation sets default From address in mailers. It sets the address from SMTP_FROM_ADDRESS, or notifications@localhost. The behavior is occasionally undesired results. In production environment, notifications@localhost is likely to be incorrect. In testing environment, the email address should not be varied by a environment variable. After appling this change, In production environment, it will throw an exception when launching Mastodon. In testing environment, the address will be fixed with notifications@localhost.
2017-07-06Add a setting allowing the use of system's default font in Web UI (#4033)Damien Erambert
* add a system_font_ui setting on the server * Plug the system_font_ui on the front-end * add EN/FR locales for the new setting * put Roboto after all other fonts * remove trailing whitespace so CodeClimate is happy * fix user_spec.rb * correctly write user_spect this time * slightly better way of adding the classes * add comments to the system-font stack for clarification * use .system-font for the class instead * don't use multiple lines for comments * remove trailing whitespace * use the classnames module for consistency * use `mastodon-font-sans-serif` instead of Roboto directly
2017-07-06l10n Occitan locale (#4089)Quent-in
* Small adjustments About the report part. * Update time format
2017-07-06i18n: minor changes in Polish translation (#4087)m4sk1n
* i18n: minor changes in Polish translation * Update pl.json
2017-07-04i18n: Updated Polish translation (#4068)m4sk1n
* i18n: Updated Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * fuggin nano
2017-07-04i18n: Update korean translation (#4066)Gyuhwan Park
* Added Korean Translation (based on japanese) * Update korean translation * Update korean translation: fix syntax error * Updated korean translation * Update korean translation * Update ko.json Translate non-translated parts * Update ko.yml Translated missed parts - and fixed some typos * Create simple_form.ko.yml * Updated korean translation * i18n: fix test fails * Updated korean translation
2017-07-04Fix Korean translation (#4065)Minori Hiraoka
* Added Korean Translation (based on japanese) * Update korean translation * Update korean translation: fix syntax error * Updated korean translation * Update korean translation * Update ko.json Translate non-translated parts * Update ko.yml Translated missed parts - and fixed some typos * Create simple_form.ko.yml * Update simple_form.ko.yml Translation error fix - password change form * Update simple_form.ko.yml * Update ko.json Missing translation
2017-07-04i18n: Add korean translation (#4064)Gyuhwan Park
* Added Korean Translation (based on japanese) * Update korean translation * Update korean translation: fix syntax error * Updated korean translation * Update korean translation * Update ko.json Translate non-translated parts * Update ko.yml Translated missed parts - and fixed some typos * Create simple_form.ko.yml * Updated korean translation * i18n: fix test fails
2017-07-04Customizable privacy policy from admin interface (#4062)Yamagishi Kazutoshi
2017-07-03Update Japanese translation (#4051)のら
2017-07-03Update Russian translation (sessions) (#4041)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 * Update Russian translation * Update Russian translation (pluralizations) * Update Russian translation * Update Russian translation * Update Russian translation (pin) * Update Russian translation (account deletion) * Fix extra line * Update Russian translation (sessions)
2017-07-02Update French locales (#4034)Damien Erambert
* add missing locales for French translation * accent "Media" in the front-end locales * images => médias * Change 'rapport' to 'signalement' in French locales to be more coherent * fix typo * remove duplicate EN locale * translate missing locales * update missing locale * fix typo * unify with "utilisateur⋅ice⋅s" * address PR comments
2017-07-01Update Japanese translation (Credentials -> Security) (#4025)unarist
2017-06-30Fix webpack-dev-server on Windows (#4000)Nolan Lawson
* Fix webpack-dev-server on Windows * Serve webpack from 0.0.0.0, access at 127.0.0.1
2017-06-28Add Japanese translations (#3985)Yamagishi Kazutoshi
ref #3929, #3935, #3949, #3981
2017-06-28i18n: added email to activerecord.pl.yml (#3981)m4sk1n
2017-06-27i18n: Minor fix in devise.pl.yml (#3978)m4sk1n
2017-06-27Merge remote-tracking branch 'upstream/master'beatrix-bitrot
2017-06-27i18n: E-mail notifications to admins about new reports (pl) (#3975)m4sk1n
2017-06-27Fix #1624 - Send e-mail notifications to admins about new reports (#3949)Eugen Rochko
2017-06-26i18n: Updated Polish translation (#3956)m4sk1n
* i18n: Updated Polish translation * Update pl.yml
2017-06-26i18n: Warning to look into the spam folder (pl) (#3955)m4sk1n
2017-06-26Translate pin/unpin and fix some inconsistencies in gender neutral strings ↵Alda Marteau-Hardi
(#3952)
2017-06-25Fix #3910 - Require OTP authentication to disable 2FA (#3935)Eugen Rochko
* Fix #3910 - Require OTP authentication to disable 2FA. Also, remove ability to generate new OTP backup codes *after* initial backup codes were handed out during activation * Restore recovery code re-generation * Improve display of some 2FA elements
2017-06-25Bind web UI access tokens to sessions (#3940)Eugen Rochko
* Add overview of active sessions * Better display of browser/platform name * Improve how browser information is stored and displayed for sessions overview * Fix test * Fix #2347 - Bind web UI access token to session When you logout, session also destroys the access token, so it's no longer valid. If access token is destroyed some other way, the session is also destroyed, requiring a re-login. Fix #1681 - Add scheduler to remove revoked access tokens and grants * Fix test
2017-06-25fix unnecessary variable (#3947)amazedkoumei
2017-06-25Rename "Credentials" page to "Security" for clarity (#3941)Eugen Rochko
* Rename "Credentials" page to "Security" for clarity * Change "security" icon from cog to lock
2017-06-25more free pgconfig by .env (#3909)amazedkoumei
* more free pgconfig for streaming by .env * fix wrong default values * database.yml read ENV as same as streaming server
2017-06-25Add overview of active sessions (#3929)Eugen Rochko
* Add overview of active sessions * Better display of browser/platform name * Improve how browser information is stored and displayed for sessions overview * Fix test
2017-06-25Fix react-intl/locale-data import issue on production build (#3937)unarist
Webpack seems to fail to import `react-intl/locale-data/*.js` if those files has been proceed by babel, and this also breaks applying our translation. Note that this won't be a problem on English locale, because react-intl includes it as default and works fine without manually added locale-data. Also this issue seems to only occurs on production build, but I'm not sure about reason.
2017-06-24Fix webpack config for Windows (#3926)unarist
2017-06-23cybre cleanupCharlotte Fields
2017-06-23All cybrespace changes through 5/28Chronister
2017-06-23update local modifications for cors and cpbeatrix-bitrot
2017-06-23CORS tweaksBeatrix Bitrot
2017-06-23Revocable sessions (#3616)Sorin Davidoi
* feat: Revocable sessions * fix: Tests using sign_in * feat: Configuration entry for the maximum number of session activations
2017-06-23Apply babel to react-intl to remove prop-types (#3914)Nolan Lawson
2017-06-23Upgrade to Webpack 3 with module concatenation (#3912)Nolan Lawson
2017-06-22Update Russian translation (#3902)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 * Update Russian translation * Update Russian translation (pluralizations) * Update Russian translation * Update Russian translation * Update Russian translation (pin) * Update Russian translation (account deletion) * Fix extra line
2017-06-22Update of doorkeeper.oc.yml (#3896)Quent-in
Just some adjustements
2017-06-20i18n: Fixed typo in Polish translation (#3864)m4sk1n
2017-06-19Add Japanese translation "Action taken by" (#3850)のら
2017-06-19setting-for-account-deletable (#3852)masarakki
2017-06-19Re-add disableHostCheck (regression #3729) (#3854)Yamagishi Kazutoshi
ref #2790