about summary refs log tree commit diff
path: root/config
AgeCommit message (Collapse)Author
2017-10-13l10n: PT-BR translation updated (#5362)Anna e só
* PT-BR translation updated * Testing * Indentation error fixed * More indentation errors fixed
2017-10-12Updating more Dutch strings for 2.0 (#5359)Jeroen
2017-10-12Fix some consistance errors in gender neutral formulations. Add some missing ↵Alda Marteau-Hardi
ones. (#5350)
2017-10-12Update fr.yml (#5330)JohnD28
* Update fr.yml Update of french translation and reformatting Privacy Policy for better maintenance. * Update fr.yml * Update fr.yml * Update fr.yml Corrections suivant les remarques d'Alda. * Update fr.yml * Update fr.yml * Update fr.yml * Update fr.yml * Update fr.yml I have replaced my proposals with those accepted here to reduce the conflict. https://github.com/tootsuite/mastodon/pull/5340 J'ai remplacé mes propositions par celles acceptées ici pour réduire le conflit. Comment dois-je faire à l'avenir pour éviter ce genre de situations ? * Update fr.yml Conflict reduction.
2017-10-12i18n: Update Polish translation (#5346)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-10-12Moderation notes (#5344)JeanGauthier
2017-10-12Update ja.yml (#5342)nullkal
* Update ja.yml * Update simple_form.ja.yml
2017-10-12Fixes and updates for the French translation (#5340)Sylvhem
* Ajout du support des thèmes multiples Ajoute des traductions pour les nouvelles chaînes permettant le support de thèmes multiples. Add translations for the new strings allowing support for multiple themes. * Mise à jour de la traduction Met à jour les chaînes modifiées et ajoute des traductions pour celle n’en ayant pas. Update modified strings and add new translations for the ones who are missing them. * 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 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.
2017-10-11Update doorkeeper.fr.yml (#5317)JohnD28
2017-10-10Remove prop types from external libraries (#5304)Nolan Lawson
2017-10-10Update German translation (#5302)Jakob Kramer
2017-10-09Remove timestamps on any option (#5282)Jeong Arm
2017-10-09Fix migration failure due to StrongMigrations on production env (#5283)unarist
2017-10-08Set snowflake IDs for backdated statuses (#5260)Eugen Rochko
- Rename Mastodon::TimestampIds into Mastodon::Snowflake for clarity - Skip for statuses coming from inbox, aka delivered in real-time - Skip for statuses that claim to be from the future
2017-10-08i18n: Update Polish translation (#5270)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-10-08Translate some Esperanto (#5252)Jeong Arm
* Translate some Esperanto * More translation * More Esperanto translation * Esperanto translation * Fix mistaken format
2017-10-08i18n update Occitan (#5263)JeanGauthier
* Update oc.json * Update oc.yml * Update oc.yml * Update oc.json
2017-10-08Use ES module build of react-router-dom (#5264)Nolan Lawson
2017-10-07Add moderation note (#5240)nullkal
* Add moderation note * Add frozen_string_literal * Make rspec pass
2017-10-07Redesign public hashtag pages (#5237)Eugen Rochko
2017-10-07Encode custom emojis as resolveable objects in ActivityPub (#5243)Eugen Rochko
* Encode custom emojis as resolveable objects in ActivityPub * Improve code style
2017-10-07Korean translation (#5244)Jeong Arm
* [i18n] Korean translation Add missing Korean translations. [skip ci] * start ci
2017-10-06i18n: Update Polish translation (#5255)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-10-06Clean up code style of Mastodon::TimestampId module (#5232)Eugen Rochko
* Clean up code style of Mastodon::TimestampId module * Update brakeman config
2017-10-05Improve admin UI for custom emojis, add copy/disable/enable (#5231)Eugen Rochko
2017-10-04adjust public profile pages 2 (#5223)Lynx Kotoura
2017-10-04Update German translation (#5221)Jakob Kramer
2017-10-04Implement EmailBlackList (#5109)utam0k
* Implement BlacklistedEmailDomain * Use Faker::Internet.domain_name * Remove note column * Add frozen_string_literal comment * Delete unnecessary codes * Sort alphabetically * Change of wording * Rename BlacklistedEmailDomain to EmailDomainBlock
2017-10-04Separate notifications preferences from general preferences (#4447)Yamagishi Kazutoshi
* Separate notifications preferences from general preferences * Refine settings/notifications/show * remove preferences.notifications
2017-10-04Configure webpack to poll for changes in development (#5040)aschmitz
* Configure webpack to poll for changes in development Vagrant on Linux/macOS hosts shared files via NFS, which doens't support inotify-based watching of files. This tweak makes webpack check for changes every second, and rebuild if necessary. This removes the need to restart Foreman every time a frontend file changes. Note that rebuilding is still a relatively lengthy process. The polling frequency can be changed to taste. * Only poll in Vagrant This tests for the presence of the VAGRANT environment variable to determine whether or not we're in Vagrant. It is set in .env.vagrant, which is set up to be included in the Vagrantfile.
2017-10-03Add missing Japanese translations (#5193)Yamagishi Kazutoshi
* yarn manage:translations * Add Japanese translations for #5170 * Add Japanese translations for #5123 * Add Japanese translations for #5046 * Add Japanese translations for #5099 * Add Japanese translations for #5161 * "項目" -> "絵文字"
2017-10-03Update German translation (#5189)Jakob Kramer
2017-10-02i18n: Update translation files and Polish translation (#5180)m4sk1n
* Update translation files Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-10-02Korean translation (#5185)Jeong Arm
* Add missing Korean translations * Add Korean email confirmation template * Fix Korean typo
2017-10-01l10n Update OC: reorganization pref. page (#5168)JeanGauthier
2017-10-01Reorganize preferences page (#5161)Eugen Rochko
2017-09-30Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)Eugen Rochko
2017-09-30Change wording on landing page. (#4805)roikale
"Ilmainen" means "gratis", but Mastodon is free as in freedom, libre – "vapaa". https://fi.wikipedia.org/wiki/Vapaa_ohjelmisto
2017-09-30Fix Paperclip::Fog always responds Not Found in OpenStack-v2 like ConoHa (#5155)Nishi, Keisuke
2017-09-29Updated German translation (#5151)Jakob Kramer
Translate "about" page, several settings pages, data export/import, sessions overview, authorized followers page, account deletion page. More consistent use of words: - A toot is a Beitrag. - An account is a Konto. Some small improvements.
2017-09-29Better Japanese translations (#5142)Yanaken
2017-09-29Replace self-rolled statsd instrumention with localshred/nsa (#5118)Eugen Rochko
2017-09-28Update German translation (#5133)Jakob Kramer
Create activerecord.de.yml (50%) Update devise.de.yml Update doorkeeper.de.yml (100%) Update simple_form.de.yml (100%)
2017-09-28OC 500 error (#5110)JeanGauthier
2017-09-28Add ability to specify alternative text for media attachments (#5123)Eugen Rochko
* Fix #117 - Add ability to specify alternative text for media attachments - POST /api/v1/media accepts `description` straight away - PUT /api/v1/media/:id to update `description` (only for unattached ones) - Serialized as `name` of Document object in ActivityPub - Uploads form adjusted for better performance and description input * Add tests * Change undo button blend mode to difference
2017-09-27When OAuth password verification fails, return 401 instead of redirect (#5111)Eugen Rochko
Call to warden.authenticate! in resource_owner_from_credentials would make the request redirect to sign-in path, which is a bad response for apps. Now bad credentials just return nil, which leads to HTTP 401 from Doorkeeper. Also, accounts with enabled 2FA cannot be logged into this way.
2017-09-27Upgrade Webpacker to version 3.0.1 (#5122)Yamagishi Kazutoshi
2017-09-26i18n: Update Polish translation (#5106)m4sk1n
* i18n: Update Polish translation * i18n: Update Polish translation
2017-09-26Follow-up to #4582 and #5027, removing dead code (#5101)Eugen Rochko
2017-09-25New error page graphic. Other error page improvements (#5099)Eugen Rochko
- 500.html generated with admin-set default locale if set - Error page `<title>` includes Mastodon site title - 500 title changed to "This page is not correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A>) - 500 content appended with "on our end" to make clear it's not user's fault