about summary refs log tree commit diff
path: root/config
AgeCommit message (Collapse)Author
2017-10-26Theme: Windows 95Andrew
2017-10-18Some typos and supplementation in sentence structures (#5441)Håkan Eriksson
* Swedish file added * Swedish file added * Swedish file updated * Swedish languagefile added * Add Swedish translation * Add Swedish translation * Started the Swedish translation * Added Swedish lang settings * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Swedish language completed and added * Swedish language Simple_form added * Swedish language Divise added * Swedish language doorkeeper added * Swedish language - now all file complete * Swedish - Typos and supplementation in sentence structure * Update simple_form.sv.yml * Update sv.yml * Update sv.yml Rearranged the alphabetical order.
2017-10-17Dutch: A few strings I found last minute (#5440)Jeroen
* Dutch: A few strings I found last minute * Update simple_form.nl.yml
2017-10-17i18n better wording (OC/CA/FR) + string added in FR (#5438)JeanGauthier
* Update oc.json * Update fr.json * Update ca.json * Update fr.json * Update simple_form.fr.yml * Update ca.json * Update fr.json * Update oc.json * Update oc.json * Update fr.json
2017-10-17Update German translation (#5425)Jakob Kramer
2017-10-17Add Japanese translations (#5427)Yamagishi Kazutoshi
* yarn manage:translations * Add Japanese translation for #5410 * Add Japanese translation for #5393
2017-10-17Normalize locale files (#5429)Yamagishi Kazutoshi
2017-10-17use-DB_NAME-in-development (#5430)masarakki
2017-10-17Swedish translation (#5406)Håkan Eriksson
* Swedish file added * Swedish file added * Swedish file updated * Swedish languagefile added * Add Swedish translation * Add Swedish translation * Started the Swedish translation * Added Swedish lang settings * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Swedish language completed and added * Swedish language Simple_form added * Swedish language Divise added * Swedish language doorkeeper added * Swedish language - now all file complete
2017-10-17Small update Dutch (nl) strings (#5424)Jeroen
* Update Dutch strings * Update Dutch
2017-10-16i18n: Update Polish translation (#5416)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-10-16i18n ultim hour «More» dropdown title + reduce motion (#5415)JeanGauthier
* Correction fem. form * More dropdown title * More dropdown title * More dropdown title * Add option to reduce motion (#5393)
2017-10-16Add option to reduce motion (#5393)Nolan Lawson
* Add option to reduce motion * Use HOC to wrap all Motion calls * fix case-sensitive issue * Avoid updating too frequently * Get rid of unnecessary change to _simple_status.html.haml
2017-10-15Add up-to-date korean translation on serverside (#5400)voidSatisfaction
* chore: add korean translation on ko.yml * feat: add simple form korean translation up-to-date
2017-10-15l10n Occitan: finishing touches (#5404)JeanGauthier
* Update oc.json * Update oc.yml
2017-10-15Update French translation (#5401)Yannick A
2017-10-14Updated Catalan strings (#5323)spla
* Add Catalan language * Add Catalan language * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update settings_helper.rb * Update mastodon.js * Update index.js * Update application.rb * Update ca.yml * removed extra spaces at line 225 * Catalan translation update added activerecord.ca.yml * Update activerecord.ca.yml Done * Updated activerecord.ca.yml * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Update ca.json Removed : <<<<<<< HEAD "getting_started.support": "{faq} • {userguide} • {apps}", ======= >>>>>>> upstream/master * Syncing to master * Added new Catalan strings * removed config.secret_key line * Corrected <sotrong> tag to <strong> Line 515 * Removed extra line * Reverted * yarn.lock reverted * Updated Catalan strings * Updated Catalan strings
2017-10-14Update French translation (#5384)Yannick A
Update French translation
2017-10-14l10n: update Persian translation for 2.0 (#5391)Masoud Abkenar
2017-10-14Correct some misspellings (#5381)Mathias B
* Correct some misspellings Remove some english language and put the proper french words in place. * Forgot some shit Buurps'
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.