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 ec49aa8175 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Updated upstream, we deleted it to not be flooded by Depandabot. Kept deleted. - `Gemfile.lock`: Puma updated on both sides, went for the most recent version. - `app/controllers/api/v1/mutes_controller.rb`: Upstream updated the serializer to support timed mutes, while glitch-soc added a custom API ages ago to get information that is already available elsewhere. Dropped the glitch-soc-specific API, went with upstream changes. - `app/javascript/core/admin.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/javascript/packs/public.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/models/mute.rb`: 🤷 - `app/models/user.rb`: New user setting added upstream while we have glitch-soc-specific user settings. Added upstream's user setting. - `config/settings.yml`: Upstream added a new user setting close to a user setting we had changed the defaults for. Added the new upstream setting. - `package.json`: Upstream dependency updated “too close” to a glitch-soc-specific dependency. No real conflict. Updated the dependency.		4 years ago
..
locale-data	[i18n] update and corrections for Occitan locale (#9404)	6 years ago
ar.json	ran `yarn manage:translations` (#14344)	4 years ago
ast.json	ran `yarn manage:translations` (#14344)	4 years ago
bg.json	reword "boost to original audience" as per #14596 (#14598)	4 years ago
bn.json	ran `yarn manage:translations` (#14344)	4 years ago
br.json	reword "boost to original audience" as per #14596 (#14598)	4 years ago
ca.json	New Crowdin updates (#14335)	4 years ago
co.json	New Crowdin updates (#14285)	4 years ago
cs.json	ran `yarn manage:translations` (#14344)	4 years ago
cy.json	ran `yarn manage:translations` (#14344)	4 years ago
da.json	ran `yarn manage:translations` (#14344)	4 years ago
de.json	New Crowdin updates (#14285)	4 years ago
defaultMessages.json	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
el.json	New Crowdin updates (#14335)	4 years ago
en.json	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
eo.json	New Crowdin updates (#14197)	4 years ago
es-AR.json	New Crowdin updates (#14285)	4 years ago
es.json	New Crowdin updates (#14335)	4 years ago
et.json	ran `yarn manage:translations` (#14344)	4 years ago
eu.json	ran `yarn manage:translations` (#14344)	4 years ago
fa.json	New Crowdin updates (#14285)	4 years ago
fi.json	New Crowdin updates (#14335)	4 years ago
fr.json	New Crowdin updates (#14335)	4 years ago
ga.json	reword "boost to original audience" as per #14596 (#14598)	4 years ago
gl.json	New Crowdin updates (#14335)	4 years ago
he.json	reword "boost to original audience" as per #14596 (#14598)	4 years ago
hi.json	reword "boost to original audience" as per #14596 (#14598)	4 years ago
hr.json	reword "boost to original audience" as per #14596 (#14598)	4 years ago
hu.json	New Crowdin updates (#14335)	4 years ago
hy.json	New Crowdin updates (#14335)	4 years ago
id.json	ran `yarn manage:translations` (#14344)	4 years ago
index.js	…
io.json	reword "boost to original audience" as per #14596 (#14598)	4 years ago
is.json	ran `yarn manage:translations` (#14344)	4 years ago
it.json	New Crowdin updates (#14285)	4 years ago
ja.json	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
ka.json	ran `yarn manage:translations` (#14344)	4 years ago
kab.json	reword "boost to original audience" as per #14596 (#14598)	4 years ago
kk.json	ran `yarn manage:translations` (#14344)	4 years ago
kn.json	reword "boost to original audience" as per #14596 (#14598)	4 years ago
ko.json	New Crowdin updates (#14335)	4 years ago
ku.json	reword "boost to original audience" as per #14596 (#14598)	4 years ago
lt.json	reword "boost to original audience" as per #14596 (#14598)	4 years ago
lv.json	reword "boost to original audience" as per #14596 (#14598)	4 years ago
mk.json	reword "boost to original audience" as per #14596 (#14598)	4 years ago
ml.json	reword "boost to original audience" as per #14596 (#14598)	4 years ago
mr.json	reword "boost to original audience" as per #14596 (#14598)	4 years ago
ms.json	reword "boost to original audience" as per #14596 (#14598)	4 years ago
nl.json	New Crowdin updates (#14335)	4 years ago
nn.json	ran `yarn manage:translations` (#14344)	4 years ago
no.json	ran `yarn manage:translations` (#14344)	4 years ago
oc.json	ran `yarn manage:translations` (#14344)	4 years ago
pl.json	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
pt-BR.json	New Crowdin updates (#14335)	4 years ago
pt-PT.json	New Crowdin updates (#14285)	4 years ago
ro.json	ran `yarn manage:translations` (#14344)	4 years ago
ru.json	New Crowdin updates (#14335)	4 years ago
sc.json	ran `yarn manage:translations` (#14344)	4 years ago
sk.json	ran `yarn manage:translations` (#14344)	4 years ago
sl.json	ran `yarn manage:translations` (#14344)	4 years ago
sq.json	New Crowdin updates (#14335)	4 years ago
sr-Latn.json	reword "boost to original audience" as per #14596 (#14598)	4 years ago
sr.json	ran `yarn manage:translations` (#14344)	4 years ago
sv.json	ran `yarn manage:translations` (#14344)	4 years ago
szl.json	reword "boost to original audience" as per #14596 (#14598)	4 years ago
ta.json	ran `yarn manage:translations` (#14344)	4 years ago
tai.json	reword "boost to original audience" as per #14596 (#14598)	4 years ago
te.json	ran `yarn manage:translations` (#14344)	4 years ago
th.json	New Crowdin updates (#14335)	4 years ago
tr.json	ran `yarn manage:translations` (#14344)	4 years ago
ug.json	reword "boost to original audience" as per #14596 (#14598)	4 years ago
uk.json	ran `yarn manage:translations` (#14344)	4 years ago
ur.json	reword "boost to original audience" as per #14596 (#14598)	4 years ago
vi.json	New Crowdin updates (#14335)	4 years ago
whitelist_ar.json	…
whitelist_ast.json	…
whitelist_bg.json	…
whitelist_bn.json	Weblate translations (2019-03-24) (#10362)	5 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)	5 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)	5 years ago
whitelist_hr.json	…
whitelist_hu.json	…
whitelist_hy.json	…
whitelist_id.json	…
whitelist_io.json	…
whitelist_is.json	New Crowdin translations (#12378)	4 years ago
whitelist_it.json	…
whitelist_ja.json	…
whitelist_ka.json	…
whitelist_kab.json	New Crowdin translations (#12378)	4 years ago
whitelist_kk.json	Weblate translations (2019-02-23) (#10103)	5 years ago
whitelist_kn.json	New Crowdin translations (#12146)	5 years ago
whitelist_ko.json	…
whitelist_ku.json	New Crowdin updates (#14197)	4 years ago
whitelist_lt.json	New Crowdin translations (#11060)	5 years ago
whitelist_lv.json	Weblate translations (2019-01-08) (#9758)	5 years ago
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	Remove links to bridge.joinmastodon.org (non-functional) (#9608)	5 years ago
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)	4 years ago
whitelist_sk.json	…
whitelist_sl.json	…
whitelist_sq.json	Weblate translations (2019-02-11) (#10007)	5 years ago
whitelist_sr-Latn.json	…
whitelist_sr.json	…
whitelist_sv.json	…
whitelist_szl.json	New Crowdin translations (#13749)	4 years ago
whitelist_ta.json	…
whitelist_tai.json	New Crowdin translations (#13749)	4 years ago
whitelist_te.json	…
whitelist_th.json	…
whitelist_tr.json	…
whitelist_ug.json	New Crowdin updates (#14197)	4 years ago
whitelist_uk.json	…
whitelist_ur.json	New Crowdin translations (#12146)	5 years ago
whitelist_vi.json	New Crowdin translations (#12378)	4 years ago
whitelist_zh-CN.json	…
whitelist_zh-HK.json	…
whitelist_zh-TW.json	…
zh-CN.json	New Crowdin updates (#14335)	4 years ago
zh-HK.json	New Crowdin updates (#14335)	4 years ago
zh-TW.json	New Crowdin updates (#14335)	4 years ago