You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		6 years ago
..
locale-data	[i18n] update and corrections for Occitan locale (#9404)	6 years ago
ar.json	Weblate translations (2019-04-10) (#10545)	6 years ago
ast.json	Weblate translations (2019-04-10) (#10545)	6 years ago
bg.json	Weblate translations (2019-04-10) (#10545)	6 years ago
bn.json	Weblate translations (2019-04-10) (#10545)	6 years ago
ca.json	Weblate translations (2019-04-10) (#10545)	6 years ago
co.json	i18n: Update Corsican translations (#10504)	6 years ago
cs.json	I18n: Final Czech translation 🇨🇿 (#10542)	6 years ago
cy.json	Weblate translations (2019-04-10) (#10545)	6 years ago
da.json	Weblate translations (2019-04-10) (#10545)	6 years ago
de.json	Updated German locales (#10505)	6 years ago
defaultMessages.json	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
el.json	Weblate translations (2019-04-10) (#10545)	6 years ago
en.json	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
eo.json	Weblate translations (2019-04-10) (#10545)	6 years ago
es.json	Weblate translations (2019-04-10) (#10545)	6 years ago
eu.json	Weblate translations (2019-04-10) (#10545)	6 years ago
fa.json	Weblate translations (2019-04-10) (#10545)	6 years ago
fi.json	Weblate translations (2019-04-10) (#10545)	6 years ago
fr.json	Weblate translations (2019-04-10) (#10545)	6 years ago
gl.json	Weblate translations (2019-04-10) (#10545)	6 years ago
he.json	Weblate translations (2019-04-10) (#10545)	6 years ago
hi.json	Add hi.json (#10573)	6 years ago
hr.json	Weblate translations (2019-04-10) (#10545)	6 years ago
hu.json	Weblate translations (2019-04-10) (#10545)	6 years ago
hy.json	Update hy.json (#10591)	6 years ago
id.json	Weblate translations (2019-04-10) (#10545)	6 years ago
index.js	Finalized theme loading and stuff	7 years ago
io.json	Weblate translations (2019-04-10) (#10545)	6 years ago
it.json	Weblate translations (2019-04-10) (#10545)	6 years ago
ja.json	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ka.json	Weblate translations (2019-04-10) (#10545)	6 years ago
kk.json	Weblate translations (2019-04-10) (#10545)	6 years ago
ko.json	Translate Korean (#10499)	6 years ago
lv.json	Weblate translations (2019-04-10) (#10545)	6 years ago
ms.json	Weblate translations (2019-04-10) (#10545)	6 years ago
nl.json	Update NL (Dutch) translation (#10601)	6 years ago
no.json	Weblate translations (2019-04-10) (#10545)	6 years ago
oc.json	Weblate translations (2019-04-10) (#10545)	6 years ago
pl.json	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
pt-BR.json	Add new pt-br translations (#10564)	6 years ago
pt.json	Weblate translations (2019-04-10) (#10545)	6 years ago
ro.json	Weblate translations (2019-04-10) (#10545)	6 years ago
ru.json	Add hi.json (#10573)	6 years ago
sk.json	Weblate translations (2019-04-10) (#10545)	6 years ago
sl.json	Weblate translations (2019-04-10) (#10545)	6 years ago
sq.json	Weblate translations (2019-04-10) (#10545)	6 years ago
sr-Latn.json	Weblate translations (2019-04-10) (#10545)	6 years ago
sr.json	Weblate translations (2019-04-10) (#10545)	6 years ago
sv.json	Weblate translations (2019-04-10) (#10545)	6 years ago
ta.json	Weblate translations (2019-04-10) (#10545)	6 years ago
te.json	Weblate translations (2019-04-10) (#10545)	6 years ago
th.json	Weblate translations (2019-04-10) (#10545)	6 years ago
tr.json	Weblate translations (2019-04-10) (#10545)	6 years ago
uk.json	Weblate translations (2019-04-10) (#10545)	6 years ago
whitelist_ar.json	…
whitelist_ast.json	Weblate translations (2018-07-25) (#8065)	6 years ago
whitelist_bg.json	…
whitelist_bn.json	Weblate translations (2019-03-24) (#10362)	6 years ago
whitelist_ca.json	…
whitelist_co.json	Add Corsican localization (#7390)	7 years ago
whitelist_cs.json	Weblate translations (2018-07-11) (#7992)	6 years ago
whitelist_cy.json	Weblate translations (2018-08-31) (#8535)	6 years ago
whitelist_da.json	Weblate translations (2018-07-11) (#7992)	6 years ago
whitelist_de.json	…
whitelist_el.json	Add el and te (#7332)	7 years ago
whitelist_en.json	…
whitelist_eo.json	…
whitelist_es.json	…
whitelist_eu.json	Add el and te (#7332)	7 years ago
whitelist_fa.json	…
whitelist_fi.json	…
whitelist_fr.json	…
whitelist_gl.json	Weblate translations (#5946)	7 years ago
whitelist_he.json	…
whitelist_hi.json	Add hi.json (#10573)	6 years ago
whitelist_hr.json	…
whitelist_hu.json	…
whitelist_hy.json	Weblate translations (#6323)	7 years ago
whitelist_id.json	…
whitelist_io.json	…
whitelist_it.json	…
whitelist_ja.json	Simplify getting started links localization. Link "powered by Mastodon" to joinmastodon.org (#3725)	8 years ago
whitelist_ka.json	Add Georgian language translation (#8250)	6 years ago
whitelist_kk.json	Weblate translations (2019-02-23) (#10103)	6 years ago
whitelist_ko.json	i18n: Add korean translation (#4064)	8 years ago
whitelist_lv.json	Weblate translations (2019-01-08) (#9758)	6 years ago
whitelist_ms.json	Remove links to bridge.joinmastodon.org (non-functional) (#9608)	6 years ago
whitelist_nl.json	…
whitelist_no.json	…
whitelist_oc.json	…
whitelist_pl.json	…
whitelist_pt-BR.json	…
whitelist_pt.json	…
whitelist_ro.json	Weblate translations (2018-09-01) (#8561)	6 years ago
whitelist_ru.json	…
whitelist_sk.json	Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167)	7 years ago
whitelist_sl.json	Weblate translations (2018-05-10) (#7438)	7 years ago
whitelist_sq.json	Weblate translations (2019-02-11) (#10007)	6 years ago
whitelist_sr-Latn.json	Fix RFC 5646 Regular Expression (#6190)	7 years ago
whitelist_sr.json	Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167)	7 years ago
whitelist_sv.json	Add Japanese translations (#5810)	7 years ago
whitelist_ta.json	Weblate translations (2018-09-02) (#8577)	6 years ago
whitelist_te.json	Add el and te (#7332)	7 years ago
whitelist_th.json	Add th.json. (#3588)	8 years ago
whitelist_tr.json	…
whitelist_uk.json	…
whitelist_zh-CN.json	…
whitelist_zh-HK.json	Fix regular expression for RFC 5646 (regression from #3604) (#4133)	7 years ago
whitelist_zh-TW.json	Add zh-TW.json (#3459)	8 years ago
zh-CN.json	Weblate translations (2019-04-10) (#10545)	6 years ago
zh-HK.json	Weblate translations (2019-04-10) (#10545)	6 years ago
zh-TW.json	Weblate translations (2019-04-10) (#10545)	6 years ago