about summary refs log tree commit diff
path: root/config
AgeCommit message (Collapse)Author
2019-05-01Minor fixes to the French translation (#10662)ThibG
2019-04-26New string added for Slovak translation (#10637)Marek Ľach
2019-04-24Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-04-23Fix stoplight logging to stderr separate from Rails logger (#10624)Eugen Rochko
2019-04-22Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/javascript/mastodon/features/compose/components/compose_form.js Upstream cleaned up a bit, including on lines in which we replaced the hardcoded 500 character limit with a maxChar constant. Applied the changes while keeping maxChar instead of 500. - app/javascript/packs/public.js Moved upstream's new animated avatar hover handling in app/javascript/core/public.js - app/javascript/styles/fonts/montserrat.scss Upstream fixed local font name, applied those changes. - app/javascript/styles/fonts/roboto.scss Upstream fixed local font name, applied those changes. - lib/mastodon/version.rb Upstream made repo URL configurable, did the same, but default to glitch-soc
2019-04-21i18n: Fix misleading strings in Polish translation (#10615)marcin mikołajczak
2019-04-21Small fix Dutch translation (#10612)jeroenpraat
* Small fix Dutch translation * Better descriptive titles See #10611
2019-04-21i18n: Update Catalan translation (#10559)Yamagishi Kazutoshi
* Updated Catalan strings * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * bundle exec i18n-tasks * Update ca.json * Update simple_form.ca.yml * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations
2019-04-21Update NL (Dutch) translation (#10601)jeroenpraat
* Update NL language strings Have to do it this way, cause this file is locked on Weblate * fix * Update simple_form.nl.yml * Update nl.yml
2019-04-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-04-19Add forgotten textThibaut Girka
2019-04-19Allow turning keybase off instance-wideThibaut Girka
2019-04-18Some new strings for Slovak (#10596)Marek Ľach
2019-04-16Update sk.yml translation again (#10589)Marek Ľach
* Update sk.yml * Update sk.yml * Update sk.yml
2019-04-16Important Slovak grammar fixes (#10585)Marek Ľach
* Important grammar fixes for SK Devise translation * Important Slovak grammar fixes * Update devise.sk.yml * Important Slovak grammar fixes Last batch for today :-) * Update devise.sk.yml * Update sk.yml * Update sk.yml * Update sk.yml
2019-04-15Updates the Slovak translation further (#10584)Marek Ľach
2019-04-15i18n: Update Corsican translation (#10583)Alix Rossi
2019-04-13Small SK locale fixes (#10561)Marek Ľach
* Small SK locale fixes * Update devise.sk.yml
2019-04-13New strings added into the Slovak translation (#10562)Marek Ľach
* New strings added into the Slovak translation * Update sk.yml * Update sk.yml * Update sk.yml * Update sk.yml
2019-04-13Add new pt-br translations (#10564)Renato "Lond" Cerqueira
2019-04-12Merge branch 'glitch' into productionReverite
2019-04-11Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-04-10[i18n] Update for Occitan language (#10548)Quentí
* Update activerecord.oc.yml * Update simple_form.oc.yml * Fix typo * Update simple_form.oc.yml * Remove trailing whitespace
2019-04-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-04-10i18n: Russian localization update (#10515)Evgeny Petrov
* i18n: Updated ru.json for Russian language * i18n: Updated ru.yml * Normalize ru.yml * i18n: Updated simple_form.ru.yml * i18n: Updated activerecord.ru.yml, devise.ru.yml, normalized strings * Added new strings to ru.json * Deleted unused (?) string * i18n: Added recent strings (Settings refactor)
2019-04-10Weblate translations (2019-04-10) (#10545)Eugen Rochko
* Translated using Weblate (Occitan) Currently translated at 95.7% (780 of 815 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Greek) Currently translated at 100,0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (French) Currently translated at 100.0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/fr/ * Translated using Weblate (French) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/ * Translated using Weblate (Dutch) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/nl/ * Translated using Weblate (Galician) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/ * Translated using Weblate (Dutch) Currently translated at 100,0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Galician) Currently translated at 100,0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Arabic) Currently translated at 97.4% (372 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (French) Currently translated at 100.0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Thai) Currently translated at 75.4% (288 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/th/ * Translated using Weblate (Slovak) Currently translated at 100.0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/ * Translated using Weblate (German) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/de/ * Translated using Weblate (Slovak) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/ * Translated using Weblate (Kazakh) Currently translated at 100,0% (4 of 4 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/kk/ * Translated using Weblate (Persian) Currently translated at 100.0% (382 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Kazakh) Currently translated at 99.0% (378 of 382 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/ * i18n-tasks normalize * yarn manage:translations * Fix empty string in Occitan
2019-04-10i18n: Update Japanese translations (#10536)mayaeh
* run i18n-tasks add-missing * Update Japanese translations.
2019-04-10I18n: Add one more string (#10543)Aditoo17
2019-04-10I18n: Final Czech translation 🇨🇿 (#10542)Aditoo17
* I18n: Update Czech translation * I18n: Why do you want to join translation * I18n: Translating a bunch of more stuff
2019-04-10Updated German translation (#10539)koyu
* Updated German locales * Added account approval locales (German) * Updated JSON locales (German) * Updated German translation * Fixed grammar error (German) * New strings and adjustments (German)
2019-04-10Translation - Korean (#10540)Jeong Arm
2019-04-10i18n: Update Corsican translations (#10538)Alix Rossi
2019-04-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.
2019-04-10Change the groupings of menu items in settings navigation (#10533)Eugen Rochko
* Change the groupings of menu items in settings navigation Fix #10307 * Remove unused translations
2019-04-10Add preference to disable e-mails about new pending accounts (#10529)Eugen Rochko
2019-04-09Add "why do you want to join" field to invite requests (#10524)Eugen Rochko
* Add "why do you want to join" field to invite requests Fix #10512 * Remove unused translations * Fix broken registrations when no invite request text is submitted
2019-04-08i18n: Update Corsican translations (#10510)Alix Rossi
* i18n: Update Corsican translations * i18n: Update Corsican translations
2019-04-08Fix batch actions not working on pending accounts (#10508)ThibG
2019-04-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.
2019-04-08Updated German locales (#10505)koyu
* Updated German locales * Added account approval locales (German) * Updated JSON locales (German)
2019-04-08i18n: Update Corsican translations (#10504)Alix Rossi
2019-04-08i18n: Update Czech translation (#10506)Aditoo17
2019-04-08Translate Korean (#10499)Jeong Arm
2019-04-08Updated french translations (#10498)Hugo "Slaynash" Flores
* updated "Invalid email or password" french translation * Updated FR translations ("instance" in now "serveur")
2019-04-08i18n: Update Japanese translations (#10494)mayaeh
* Update Japanese translations * Update Japanese translations.
2019-04-07i18n: Update Corsican translations (#10496)Alix Rossi
* Update Corsican translation * Fix brackets typo
2019-04-07Improve blocked view of profiles (#10491)Eugen Rochko
* Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447)" This reverts commit 120544067fcca4bf6e71ba1ffb276c451c17c656. * Revert "Hide blocking accounts from blocked users (#10442)" This reverts commit 62bafa20a112ccdddaedb25723fc819dbbcd8e9a. * Improve blocked view of profiles - Change "You are blocked" to "Profile unavailable" - Hide following/followers in API when blocked - Disable follow button and show "Profile unavailable" on public profile as well
2019-04-07Add rate limit for media proxy requests (#10490)Eugen Rochko
30 per 30 minutes, like media uploads
2019-04-07I18n: Update Czech translation (#10489)Aditoo17
2019-04-07Updated German locales (#10488)koyu
generated by cgit-pink (git 2.37.1) at 2024-12-17 08:58:23 +0000