Thibaut Girka a9eaa780f5 Merge branch 'master' into glitch-soc/merge-upstream ...

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-22 20:40:04 +02:00

..

locale-data

Merge branch 'master' into glitch-soc/merge-upstream

2018-09-03 14:33:06 +02:00

ar.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

ast.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

bg.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

bn.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

ca.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

co.json

i18n: Update Corsican translations (#10504)

2019-04-08 21:12:06 +09:00

cs.json

I18n: Final Czech translation 🇨🇿 (#10542)

2019-04-10 14:52:08 +02:00

cy.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

da.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

de.json

Updated German locales (#10505)

2019-04-08 21:14:08 +09:00

defaultMessages.json

Merge branch 'master' into glitch-soc/merge-upstream

2019-04-08 15:57:56 +02:00

el.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

en.json

Merge branch 'master' into glitch-soc/merge-upstream

2019-04-08 15:57:56 +02:00

eo.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

es.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

eu.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

fa.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

fi.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

fr.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

gl.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

he.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

hi.json

Add hi.json (#10573)

2019-04-21 04:52:20 +02:00

hr.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

hu.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

hy.json

Update hy.json (#10591)

2019-04-21 04:48:47 +02:00

id.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

index.js

Finalized theme loading and stuff

2017-11-20 22:13:37 -08:00

io.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

it.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

ja.json

Merge branch 'master' into glitch-soc/merge-upstream

2019-04-08 15:57:56 +02:00

ka.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

kk.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

ko.json

Translate Korean (#10499)

2019-04-08 12:35:37 +09:00

lv.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

ms.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

nl.json

Update NL (Dutch) translation (#10601)

2019-04-21 04:46:08 +02:00

no.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

oc.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

pl.json

Merge branch 'master' into glitch-soc/merge-upstream

2019-04-10 21:19:21 +02:00

pt-BR.json

Add new pt-br translations (#10564)

2019-04-13 21:23:41 +09:00

pt.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

ro.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

ru.json

Add hi.json (#10573)

2019-04-21 04:52:20 +02:00

sk.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

sl.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

sq.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

sr-Latn.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

sr.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

sv.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

ta.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

te.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

th.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

tr.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

uk.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

whitelist_ar.json

…

whitelist_ast.json

…

whitelist_bg.json

…

whitelist_bn.json

Weblate translations (2019-03-24) (#10362)

2019-03-24 18:44:59 +01:00

whitelist_ca.json

…

whitelist_co.json

…

whitelist_cs.json

…

whitelist_cy.json

…

whitelist_da.json

…

whitelist_de.json

…

whitelist_el.json

…

whitelist_en.json

…

whitelist_eo.json

…

whitelist_es.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_eu.json

…

whitelist_fa.json

…

whitelist_fi.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_fr.json

…

whitelist_gl.json

…

whitelist_he.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_hi.json

Add hi.json (#10573)

2019-04-21 04:52:20 +02:00

whitelist_hr.json

…

whitelist_hu.json

…

whitelist_hy.json

…

whitelist_id.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_io.json

…

whitelist_it.json

…

whitelist_ja.json

Simplify getting started links localization. Link "powered by Mastodon" to joinmastodon.org (#3725)

2017-06-13 03:55:28 +02:00

whitelist_ka.json

…

whitelist_kk.json

Weblate translations (2019-02-23) (#10103)

2019-02-23 18:41:28 +01:00

whitelist_ko.json

…

whitelist_lv.json

Weblate translations (2019-01-08) (#9758)

2019-01-08 14:09:57 +01:00

whitelist_ms.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

whitelist_nl.json

…

whitelist_no.json

…

whitelist_oc.json

…

whitelist_pl.json

…

whitelist_pt-BR.json

…

whitelist_pt.json

…

whitelist_ro.json

…

whitelist_ru.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_sk.json

…

whitelist_sl.json

…

whitelist_sq.json

Weblate translations (2019-02-11) (#10007)

2019-02-11 07:41:35 +01:00

whitelist_sr-Latn.json

…

whitelist_sr.json

…

whitelist_sv.json

…

whitelist_ta.json

Weblate translations (2018-09-02) (#8577)

2018-09-02 18:20:26 +02:00

whitelist_te.json

…

whitelist_th.json

…

whitelist_tr.json

Fix duplicated values in nl.json (#2931)

2017-05-09 14:12:35 +02:00

whitelist_uk.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_zh-CN.json

…

whitelist_zh-HK.json

…

whitelist_zh-TW.json

…

zh-CN.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

zh-HK.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00

zh-TW.json

Weblate translations (2019-04-10) (#10545)

2019-04-10 18:17:24 +02:00