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 bf94a43496 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/oauth/authorized_applications_controller.rb Two changes too close to each other - app/controllers/settings/sessions_controller.rb - app/lib/user_settings_decorator.rb Two changes too close to each other - app/models/media_attachment.rb New changes too close to glitch-soc only changes. - app/models/user.rb Two changes too close to each other. - app/services/remove_status_service.rb Kept direct timeline code which had been removed upstream. - app/views/settings/preferences/show.html.haml Two changes too close to each other. - config/locales/en.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/ja.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/pl.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/simple_form.en.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/locales/simple_form.pl.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/settings.yml Reverted upstream's decision of enabling posting application by default.		6 years ago
..
locale-data	[i18n] update and corrections for Occitan locale (#9404)	6 years ago
ar.json	Weblate translations (2019-01-19) (#9867)	6 years ago
ast.json	Remove obsolete web UI translations (#9761)	6 years ago
bg.json	Remove obsolete web UI translations (#9761)	6 years ago
ca.json	Weblate translations (2019-01-19) (#9867)	6 years ago
co.json	Weblate translations (2019-01-15) (#9813)	6 years ago
cs.json	Weblate translations (2019-01-19) (#9867)	6 years ago
cy.json	Weblate translations (2019-01-17) (#9844)	6 years ago
da.json	Remove obsolete web UI translations (#9761)	6 years ago
de.json	Weblate translations (2019-01-19) (#9867)	6 years ago
defaultMessages.json	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
el.json	Remove obsolete web UI translations (#9761)	6 years ago
en.json	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
eo.json	Remove obsolete web UI translations (#9761)	6 years ago
es.json	Remove obsolete web UI translations (#9761)	6 years ago
eu.json	Remove obsolete web UI translations (#9761)	6 years ago
fa.json	Remove obsolete web UI translations (#9761)	6 years ago
fi.json	Remove obsolete web UI translations (#9761)	6 years ago
fr.json	Weblate translations (2019-01-15) (#9813)	6 years ago
gl.json	Weblate translations (2019-01-15) (#9813)	6 years ago
he.json	Remove obsolete web UI translations (#9761)	6 years ago
hr.json	Remove obsolete web UI translations (#9761)	6 years ago
hu.json	Remove obsolete web UI translations (#9761)	6 years ago
hy.json	Remove obsolete web UI translations (#9761)	6 years ago
id.json	Remove obsolete web UI translations (#9761)	6 years ago
index.js	…
io.json	Remove obsolete web UI translations (#9761)	6 years ago
it.json	Remove obsolete web UI translations (#9761)	6 years ago
ja.json	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ka.json	Remove obsolete web UI translations (#9761)	6 years ago
ko.json	Weblate translations (2019-01-15) (#9813)	6 years ago
lv.json	Remove obsolete web UI translations (#9761)	6 years ago
ms.json	Remove obsolete web UI translations (#9761)	6 years ago
nl.json	Weblate translations (2019-01-15) (#9813)	6 years ago
no.json	Remove obsolete web UI translations (#9761)	6 years ago
oc.json	Weblate translations (2019-01-15) (#9813)	6 years ago
pl.json	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
pt-BR.json	Weblate translations (2019-01-15) (#9813)	6 years ago
pt.json	Remove obsolete web UI translations (#9761)	6 years ago
ro.json	Weblate translations (2019-01-17) (#9844)	6 years ago
ru.json	Remove obsolete web UI translations (#9761)	6 years ago
sk.json	Weblate translations (2019-01-17) (#9844)	6 years ago
sl.json	Remove obsolete web UI translations (#9761)	6 years ago
sr-Latn.json	Remove obsolete web UI translations (#9761)	6 years ago
sr.json	Remove obsolete web UI translations (#9761)	6 years ago
sv.json	Remove obsolete web UI translations (#9761)	6 years ago
ta.json	Remove obsolete web UI translations (#9761)	6 years ago
te.json	Remove obsolete web UI translations (#9761)	6 years ago
th.json	Remove obsolete web UI translations (#9761)	6 years ago
tr.json	Remove obsolete web UI translations (#9761)	6 years ago
uk.json	Remove obsolete web UI translations (#9761)	6 years ago
whitelist_ar.json	…
whitelist_ast.json	…
whitelist_bg.json	…
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	…
whitelist_eu.json	…
whitelist_fa.json	…
whitelist_fi.json	…
whitelist_fr.json	…
whitelist_gl.json	…
whitelist_he.json	…
whitelist_hr.json	…
whitelist_hu.json	…
whitelist_hy.json	…
whitelist_id.json	…
whitelist_io.json	…
whitelist_it.json	…
whitelist_ja.json	…
whitelist_ka.json	…
whitelist_ko.json	…
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	…
whitelist_ru.json	…
whitelist_sk.json	…
whitelist_sl.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_zh-CN.json	…
whitelist_zh-HK.json	…
whitelist_zh-TW.json	…
zh-CN.json	Remove obsolete web UI translations (#9761)	6 years ago
zh-HK.json	Remove obsolete web UI translations (#9761)	6 years ago
zh-TW.json	Remove obsolete web UI translations (#9761)	6 years ago