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 83dc54c487 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.		4 years ago
..
locale-data	…
ar.json	New Crowdin translations (#13398)	5 years ago
ast.json	New Crowdin translations (#13398)	5 years ago
bg.json	Change wording from “Hide media” to “Hide image/images” in Web UI (#13834)	5 years ago
bn.json	New Crowdin translations (#13398)	5 years ago
br.json	Change wording from “Hide media” to “Hide image/images” in Web UI (#13834)	5 years ago
ca.json	New Crowdin translations (#13398)	5 years ago
co.json	New Crowdin translations (#13398)	5 years ago
cs.json	New Crowdin translations (#13398)	5 years ago
cy.json	New Crowdin translations (#13398)	5 years ago
da.json	New Crowdin translations (#13398)	5 years ago
de.json	New Crowdin translations (#13398)	5 years ago
defaultMessages.json	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
el.json	New Crowdin translations (#13398)	5 years ago
en.json	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
eo.json	New Crowdin translations (#13398)	5 years ago
es-AR.json	New Crowdin translations (#13398)	5 years ago
es.json	New Crowdin translations (#13398)	5 years ago
et.json	New Crowdin translations (#13398)	5 years ago
eu.json	New Crowdin translations (#13398)	5 years ago
fa.json	New Crowdin translations (#13398)	5 years ago
fi.json	New Crowdin translations (#13398)	5 years ago
fr.json	New Crowdin translations (#13398)	5 years ago
ga.json	Change wording from “Hide media” to “Hide image/images” in Web UI (#13834)	5 years ago
gl.json	New Crowdin translations (#13398)	5 years ago
he.json	New Crowdin translations (#13398)	5 years ago
hi.json	Change wording from “Hide media” to “Hide image/images” in Web UI (#13834)	5 years ago
hr.json	New Crowdin translations (#13398)	5 years ago
hu.json	New Crowdin translations (#13398)	5 years ago
hy.json	New Crowdin translations (#13398)	5 years ago
id.json	New Crowdin translations (#13398)	5 years ago
index.js	…
io.json	New Crowdin translations (#13398)	5 years ago
is.json	New Crowdin translations (#13398)	5 years ago
it.json	New Crowdin translations (#13398)	5 years ago
ja.json	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
ka.json	New Crowdin translations (#13398)	5 years ago
kab.json	New Crowdin translations (#13398)	5 years ago
kk.json	New Crowdin translations (#13398)	5 years ago
kn.json	Change wording from “Hide media” to “Hide image/images” in Web UI (#13834)	5 years ago
ko.json	New Crowdin translations (#13398)	5 years ago
lt.json	Change wording from “Hide media” to “Hide image/images” in Web UI (#13834)	5 years ago
lv.json	Change wording from “Hide media” to “Hide image/images” in Web UI (#13834)	5 years ago
mk.json	Change wording from “Hide media” to “Hide image/images” in Web UI (#13834)	5 years ago
ml.json	Change wording from “Hide media” to “Hide image/images” in Web UI (#13834)	5 years ago
mr.json	Change wording from “Hide media” to “Hide image/images” in Web UI (#13834)	5 years ago
ms.json	Change wording from “Hide media” to “Hide image/images” in Web UI (#13834)	5 years ago
nl.json	New Crowdin translations (#13398)	5 years ago
nn.json	New Crowdin translations (#13398)	5 years ago
no.json	New Crowdin translations (#13398)	5 years ago
oc.json	New Crowdin translations (#13398)	5 years ago
pl.json	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
pt-BR.json	New Crowdin translations (#13398)	5 years ago
pt-PT.json	New Crowdin translations (#13398)	5 years ago
ro.json	New Crowdin translations (#13398)	5 years ago
ru.json	New Crowdin translations (#13398)	5 years ago
sc.json	New Crowdin translations (#13398)	5 years ago
sk.json	New Crowdin translations (#13398)	5 years ago
sl.json	New Crowdin translations (#13398)	5 years ago
sq.json	New Crowdin translations (#13398)	5 years ago
sr-Latn.json	New Crowdin translations (#13398)	5 years ago
sr.json	New Crowdin translations (#13398)	5 years ago
sv.json	New Crowdin translations (#13398)	5 years ago
ta.json	New Crowdin translations (#13398)	5 years ago
te.json	New Crowdin translations (#13398)	5 years ago
th.json	New Crowdin translations (#13398)	5 years ago
tr.json	New Crowdin translations (#13398)	5 years ago
uk.json	New Crowdin translations (#13398)	5 years ago
ur.json	Change wording from “Hide media” to “Hide image/images” in Web UI (#13834)	5 years ago
vi.json	New Crowdin translations (#13398)	5 years ago
whitelist_ar.json	…
whitelist_ast.json	…
whitelist_bg.json	…
whitelist_bn.json	Weblate translations (2019-03-24) (#10362)	6 years ago
whitelist_br.json	New Crowdin translations (#11799)	5 years ago
whitelist_ca.json	…
whitelist_co.json	…
whitelist_cs.json	…
whitelist_cy.json	…
whitelist_da.json	…
whitelist_de.json	Add German translations (#11043)	6 years ago
whitelist_el.json	…
whitelist_en.json	…
whitelist_eo.json	…
whitelist_es-AR.json	New Crowdin translations (#11985)	5 years ago
whitelist_es.json	…
whitelist_et.json	New Crowdin translations (#11305)	5 years ago
whitelist_eu.json	…
whitelist_fa.json	…
whitelist_fi.json	…
whitelist_fr.json	…
whitelist_ga.json	New Crowdin translations (#11861)	5 years ago
whitelist_gl.json	…
whitelist_he.json	…
whitelist_hi.json	Add hi.json (#10573)	6 years ago
whitelist_hr.json	…
whitelist_hu.json	…
whitelist_hy.json	…
whitelist_id.json	…
whitelist_io.json	…
whitelist_is.json	New Crowdin translations (#12378)	5 years ago
whitelist_it.json	…
whitelist_ja.json	…
whitelist_ka.json	…
whitelist_kab.json	New Crowdin translations (#12378)	5 years ago
whitelist_kk.json	…
whitelist_kn.json	New Crowdin translations (#12146)	5 years ago
whitelist_ko.json	…
whitelist_lt.json	New Crowdin translations (#11060)	5 years ago
whitelist_lv.json	…
whitelist_mk.json	New Crowdin translations (#12047)	5 years ago
whitelist_ml.json	New Crowdin translations (#12146)	5 years ago
whitelist_mr.json	New Crowdin translations (#12146)	5 years ago
whitelist_ms.json	…
whitelist_nl.json	…
whitelist_nn.json	New Crowdin translations (#11799)	5 years ago
whitelist_no.json	…
whitelist_oc.json	…
whitelist_pl.json	…
whitelist_pt-BR.json	…
whitelist_pt-PT.json	New Crowdin translations (#11799)	5 years ago
whitelist_ro.json	…
whitelist_ru.json	…
whitelist_sc.json	New Crowdin translations (#13398)	5 years ago
whitelist_sk.json	…
whitelist_sl.json	…
whitelist_sq.json	…
whitelist_sr-Latn.json	…
whitelist_sr.json	…
whitelist_sv.json	…
whitelist_ta.json	…
whitelist_te.json	…
whitelist_th.json	…
whitelist_tr.json	…
whitelist_uk.json	…
whitelist_ur.json	New Crowdin translations (#12146)	5 years ago
whitelist_vi.json	New Crowdin translations (#12378)	5 years ago
whitelist_zh-CN.json	…
whitelist_zh-HK.json	…
whitelist_zh-TW.json	…
zh-CN.json	New Crowdin translations (#13398)	5 years ago
zh-HK.json	New Crowdin translations (#13398)	5 years ago
zh-TW.json	New Crowdin translations (#13398)	5 years ago