about summary refs log tree commit diff
path: root/config
AgeCommit message (Collapse)Author
2017-05-22Allow alternate domains for mastodon handlers (#3187)Immae
2017-05-22Only load Intl data for current language (#3130)Nolan Lawson
* Only load Intl data for current language * Extract common chunk only from application.js and public.js * Generate locale packs, avoid caching on window object
2017-05-22Updated Polish translation (#3204)m4sk1n
* i18n: updated Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: completed Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: corrected Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: Updated Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Update simple_form.pl.yml * Update simple_form.pl.yml
2017-05-22Set config.cache_store in environments file. (#3219)Clworld
* Set config.cache_store in application.rb * Set config.cache_store in environments. * fix code format.
2017-05-22Add translations for counter of profile (#3214)Yamagishi Kazutoshi
ref #3101
2017-05-22Persian translation update (#3206)Masoud Abkenar
* Persian translation update * Persian translation update: new files * Persian translation update * activerecord.fa.yml language code * Persian translation update * fix indent
2017-05-21Enhance for the Chinese translation (#3198)vidarlee
* Enhance for the Chinese translation * Add filtered_languages for Chinese Translation include CN/HK/TW for PR #3175
2017-05-21Add a Japanese translation for PR #3175 (#3192)Daigo 3 Dango
2017-05-20Adjust REDIS_URL usage in node_redis (#3183)Eugen Rochko
Resolves #2780
2017-05-20Replace mastodon:media:clear and mastodon:feeds:clear rake tasks with (#3180)Eugen Rochko
sidekiq-scheduler jobs Resolves #2495
2017-05-20Improve language filter preferences look (#3184)Eugen Rochko
2017-05-20Adds bootsnap. Faster boot time (#3176)Eugen Rochko
2017-05-20Catalan translation update (#3177)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
2017-05-20Filter languages with opt out (#3175)Matt Jankowski
* Remove allowed_languages and add filtered_languages * Use filtered_languages instead of allowed_languages
2017-05-20Improve eslint rules (#3147)Yamagishi Kazutoshi
* Add semi to ESLint rules * Add padded-blocks to ESLint rules * Add comma-dangle to ESLint rules * add config/webpack and storyboard * add streaming/ * yarn test:lint -- --fix
2017-05-20Add Japanese translations (domain block & admin page) (#3160)Yamagishi Kazutoshi
https://github.com/tootsuite/mastodon/pull/3100 https://github.com/tootsuite/mastodon/pull/3127
2017-05-19i18n: Hebrew Spam folder check warning added (#3134)Ira
2017-05-19Account domain blocks (#2381)Eugen Rochko
* Add <ostatus:conversation /> tag to Atom input/output Only uses ref attribute (not href) because href would be the alternate link that's always included also. Creates new conversation for every non-reply status. Carries over conversation for every reply. Keeps remote URIs verbatim, generates local URIs on the fly like the rest of them. * Conversation muting - prevents notifications that reference a conversation (including replies, favourites, reblogs) from being created. API endpoints /api/v1/statuses/:id/mute and /api/v1/statuses/:id/unmute Currently no way to tell when a status/conversation is muted, so the web UI only has a "disable notifications" button, doesn't work as a toggle * Display "Dismiss notifications" on all statuses in notifications column, not just own * Add "muted" as a boolean attribute on statuses JSON For now always false on contained reblogs, since it's only relevant for statuses returned from the notifications endpoint, which are not nested Remove "Disable notifications" from detailed status view, since it's only relevant in the notifications column * Up max class length * Remove pending test for conversation mute * Add tests, clean up * Rename to "mute conversation" and "unmute conversation" * Raise validation error when trying to mute/unmute status without conversation * Adding account domain blocks that filter notifications and public timelines * Add tests for domain blocks in notifications, public timelines Filter reblogs of blocked domains from home * Add API for listing and creating account domain blocks * API for creating/deleting domain blocks, tests for Status#ancestors and Status#descendants, filter domain blocks from them * Filter domains in streaming API * Update account_domain_block_spec.rb
2017-05-18i18l: Hebrew translation updates (#3109)Ira
2017-05-18Update oc.yml (#3112)Quent-in
Normally fully complete
2017-05-18Fix character counter not updating for bio (#3101)Eugen Rochko
2017-05-18Add reset button to admin accounts search, improve looks a little (#3100)Eugen Rochko
2017-05-17Add filter to AccountFilter (#2968)alpaca-tc
2017-05-17Added a warning to look into the spam folder (#2921)jeroenpraat
Inspired by a user who received the email confirmation in Gmail's spam folder. This happened with Sparkpost correctly setup.
2017-05-17Add catalan language (#3084)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
2017-05-16feat(ja): add missing ja translation. (#3083)Hiroaki Ninomiya
ref: https://github.com/tootsuite/mastodon/pull/2584
2017-05-16chore(landing_strip): hide signup path unless the instance allows ↵Hiroaki Ninomiya
registration. (#3055)
2017-05-16Improve ja translation (#3071)Hiroaki Ninomiya
* chore(ja): replace with reasonable word. * chore(ja): add periods.
2017-05-15Introduce common JavaScript file (#2981)Akihiko Odaki
* Create common chunk rather than vendor chunk vendor chunk is a set of modules provided by external vendors, but now we can have a chunk as a set of modules shared by multiple entry points, which could be more efficent than having vendor chunk. * Start rails-ujs in common.js This is used by /settings/two_factor_authentication.
2017-05-15Feature conversations muting (#3017)Eugen Rochko
* Add <ostatus:conversation /> tag to Atom input/output Only uses ref attribute (not href) because href would be the alternate link that's always included also. Creates new conversation for every non-reply status. Carries over conversation for every reply. Keeps remote URIs verbatim, generates local URIs on the fly like the rest of them. * Conversation muting - prevents notifications that reference a conversation (including replies, favourites, reblogs) from being created. API endpoints /api/v1/statuses/:id/mute and /api/v1/statuses/:id/unmute Currently no way to tell when a status/conversation is muted, so the web UI only has a "disable notifications" button, doesn't work as a toggle * Display "Dismiss notifications" on all statuses in notifications column, not just own * Add "muted" as a boolean attribute on statuses JSON For now always false on contained reblogs, since it's only relevant for statuses returned from the notifications endpoint, which are not nested Remove "Disable notifications" from detailed status view, since it's only relevant in the notifications column * Up max class length * Remove pending test for conversation mute * Add tests, clean up * Rename to "mute conversation" and "unmute conversation" * Raise validation error when trying to mute/unmute status without conversation
2017-05-14Update capistrano lock version to 3.8.1 (#3056)esetomo
2017-05-13feat(count): Just yml count syntax to provide different rule for 1 (#2685)Stephen Burgess
Update all translation forms that use this "counter" element.
2017-05-13i18n: Hebrew string updates (#3037)Ira
2017-05-13Small FR localisation enhancements (#3033)Bastien
* Small localisation enhancement. Be consistent regarding "e-mail" vs "courriel": I suggest using "courriel" to refer to the electronic message and "e-mail" when used in "adresse e-mail". This reflects the usage I generally observe, but I may be wrong. * Localisation enhancements. Omit some commas: "..., ..., ou ..." should be "..., ... ou ..." since "ou" already articulates the sentence. Also replace "demande" by "requête" when it makes sense.
2017-05-12Add back stdout logging to development environment after rails_12factor was ↵Eugen Rochko
removed (#3011)
2017-05-12Fix locales again (#3010)Eugen Rochko
* Normalize locales * Restore "mention" locale key
2017-05-12Update doorkeeper.ar.yml (#3006)ButterflyOfFire
* Update doorkeeper.ar.yml - Remodelling doorkeeper.ar.yml and adding missing strings from english version to arabic version. - Translating max strings - Reviewing some translations - Other strings to be translated later (complicated somehow) * Update doorkeeper.ar.yml Updating translations from lines : 88 to 91
2017-05-09Update Norwegian translations (#2937)Koala Yeung
* Update Norwegian translations * Updated no.json * Updated activerecord.no.yml * Updated no.yml * Updated simple_form.no.yml * i18n: fix Unicode character error in no.yml * Javascript escaping code "\uD83D\uDC18" should be "\U0001f418" in Ruby / yml * i18n: remove unused keys in Norwegian translation * Remove unused keys in no.yml and activerecord.no.yml by running: `bundle exec i18n-tasks remove-unused no` * Add missing keys in activerecord.no.yml and no.yml by running: `bundle exec i18n-tasks add-missing no` * i18n: escape the key 'no' in activerecord.no.yml
2017-05-09Remove rails_12factor (#2901)alpaca-tc
2017-05-08Updating and extending Dutch strings (#2930)jeroenpraat
* Update nl * Update nl * Update nl * Create confirmation_instructions.nl.html.erb * Create confirmation_instructions.nl.text.erb * Create password_change.nl.html.erb * Create password_change.nl.text.erb * Create reset_password_instructions.nl.html.erb * Create reset_password_instructions.nl.text.erb
2017-05-08Update simple_form.ar.yml (#2908)ButterflyOfFire
* Update simple_form.ar.yml Added missing strings that were introduced to simple_form.ar.yml and completing translation. * Create confirmation_instructions.ar.html.erb * Create confirmation_instructions.ar.text.erb * Create password_change.ar.html.erb * Create password_change.ar.text.erb * Create reset_password_instructions.ar.text.erb * Create reset_password_instructions.ar.html.erb
2017-05-08Add Thai langauge (#2903)Koala Yeung
* Updated Thai language * locale: remove unused translation in Thai * locale: add Thai to settings menu and application * locale: fix activerecord.th.yml format
2017-05-08Render sidekiq scheduler (#2898)alpaca-tc
2017-05-08Fix Ukrainian malformed locale submitted in #2893, i18n-tasks normalize (#2896)Eugen Rochko
2017-05-07Update Ukrainian, Russian translations (#2893)ster
* Update Ukrainian translation (rebased off Russian translation) * Update Ukrainian, Russian translations
2017-05-07Add final newline to locale files (#2890)Yamagishi Kazutoshi
2017-05-07namespace redis usage (#2869)beatrix
* add redis-namespace gem * namespace redis usage * refactor redis namespace code to be less intrusive previously : would be prepended to keys when the REDIS_NAMESPACE env var was not set now if it is not set the namespacing functions are not used at all, which should prevent disruptions when instances update. * fix redis namespace variable style in streaming js * remove trailing space * final redis namespace style fix
2017-05-07Add Turkish yml file (#2878)Özcan Zafer AYAN
* Add Turkish yml file * Add translation files for Turkish * Deleted click_to_edit key and val Deleted click_to_edit: Düzenlemek için ilgili ayara tıklayınız line
2017-05-07add source maps for dev/production (#2873)Nolan Lawson
2017-05-07Fix redirect path for admin (#2871)Yamagishi Kazutoshi