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 dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.		6 years ago
..
activerecord.ar.yml	Weblate translations (2018-03-02) (#6588)	7 years ago
activerecord.ast.yml	Weblate translations (2018-09-13) (#8692)	6 years ago
activerecord.ca.yml	Update and fix Catalan translation (#5773)	7 years ago
activerecord.co.yml	Add Corsican localization (#7390)	7 years ago
activerecord.cs.yml	Weblate translations (2018-08-11) (#8167)	6 years ago
activerecord.cy.yml	Weblate translations (2018-09-13) (#8692)	6 years ago
activerecord.da.yml	Weblate translations (2018-07-05) (#7950)	6 years ago
activerecord.de.yml	Weblate translations (#5922)	7 years ago
activerecord.el.yml	Weblate translations (2018-07-05) (#7950)	6 years ago
activerecord.en.yml	Run i18n-tasks normalize (#5003)	7 years ago
activerecord.es.yml	Weblate translations (#6370)	7 years ago
activerecord.eu.yml	Weblate translations (2018-05-31) (#7681)	7 years ago
activerecord.fa.yml	Run i18n-tasks normalize (#5003)	7 years ago
activerecord.fr.yml	Run i18n-tasks normalize (#5003)	7 years ago
activerecord.gl.yml	Weblate translations (#6228)	7 years ago
activerecord.he.yml	Run i18n-tasks normalize (#5003)	7 years ago
activerecord.id.yml	Run i18n-tasks normalize (#5003)	7 years ago
activerecord.it.yml	Run i18n-tasks normalize (#5003)	7 years ago
activerecord.ja.yml	Run i18n-tasks normalize (#5003)	7 years ago
activerecord.ka.yml	Add Georgian language translation (#8250)	6 years ago
activerecord.nl.yml	Weblate translations (2018-05-10) (#7438)	7 years ago
activerecord.no.yml	Update Norwegian translations (#2937)	8 years ago
activerecord.oc.yml	Weblate translations (2018-07-11) (#7992)	6 years ago
activerecord.pl.yml	Run i18n-tasks normalize (#5003)	7 years ago
activerecord.pt-BR.yml	l10n: PT-BR translation updated (#5362)	7 years ago
activerecord.pt.yml	Weblate translations (#6228)	7 years ago
activerecord.ru.yml	[RU] Updated translation (#8164)	6 years ago
activerecord.sk.yml	Add Slovak translation (#6052)	7 years ago
activerecord.sl.yml	Weblate translations (2018-07-05) (#7950)	6 years ago
activerecord.sr-Latn.yml	Adding Serbian latin translations (#6146)	7 years ago
activerecord.sr.yml	Adding Serbian translation (#6133)	7 years ago
activerecord.sv.yml	Weblate translations (2018-07-05) (#7950)	6 years ago
activerecord.th.yml	Add Thai langauge (#2903)	8 years ago
activerecord.uk.yml	Run i18n-tasks normalize (#5003)	7 years ago
activerecord.zh-CN.yml	Updating Chinese (Simplified) translations (#5508)	7 years ago
activerecord.zh-HK.yml	improve zh-HK localization by referring zh-TW and zh-CN (#6988)	7 years ago
ar.yml	Add "disable" button to report screen (#9024)	6 years ago
ast.yml	Weblate translations (2018-09-19) (#8731)	6 years ago
bg.yml	Update /terms and /about/more to use public layout (#8142)	6 years ago
ca.yml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
co.yml	Add "disable" button to report screen (#9024)	6 years ago
cs.yml	Add "disable" button to report screen (#9024)	6 years ago
cy.yml	Add "disable" button to report screen (#9024)	6 years ago
da.yml	Add "disable" button to report screen (#9024)	6 years ago
de.yml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
devise.ar.yml	Weblate translations (2018-03-13) (#6777)	7 years ago
devise.ast.yml	Weblate translations (2018-09-13) (#8692)	6 years ago
devise.bg.yml	Run i18n-tasks normalize (#5003)	7 years ago
devise.ca.yml	Weblate translations (2018-03-02) (#6588)	7 years ago
devise.co.yml	Weblate translations (2018-05-10) (#7438)	7 years ago
devise.cs.yml	Weblate translations (2018-08-11) (#8167)	6 years ago
devise.cy.yml	Weblate translations (2018-09-24) (#8768)	6 years ago
devise.da.yml	Weblate translations (2018-08-22) (#8346)	6 years ago
devise.de.yml	Weblate translations 20180503 (#7325)	7 years ago
devise.el.yml	Weblate translations (2018-07-05) (#7950)	6 years ago
devise.en.yml	Update Simplified Chinese translations (#6280)	7 years ago
devise.eo.yml	Weblate translations (2018-03-02) (#6588)	7 years ago
devise.es.yml	Weblate translations (#6370)	7 years ago
devise.eu.yml	Weblate translations (2018-06-02) (#7705)	7 years ago
devise.fa.yml	Weblate translations (2018-05-20) (#7552)	7 years ago
devise.fi.yml	Weblate translations (2018-04-15) (#7141)	7 years ago
devise.fr.yml	Major update for the French translation (#8348)	6 years ago
devise.gl.yml	Weblate translations (#6323)	7 years ago
devise.he.yml	Weblate translations (#5922)	7 years ago
devise.hr.yml	Weblate translations (2018-03-02) (#6588)	7 years ago
devise.hu.yml	Weblate translations (2018-03-02) (#6588)	7 years ago
devise.id.yml	Add Indonesian (Bahasa Indonesia / id) translation (#2200)	8 years ago
devise.io.yml	Add Ido (io) translation (#2202)	8 years ago
devise.it.yml	Weblate translations (2018-04-24) (#7252)	7 years ago
devise.ja.yml	Weblate translations (#6284)	7 years ago
devise.ka.yml	Add Georgian language translation (#8250)	6 years ago
devise.nl.yml	Weblate translations (2018-06-02) (#7705)	7 years ago
devise.no.yml	Weblate translations (#6370)	7 years ago
devise.oc.yml	l10n Occitan update (#6367)	7 years ago
devise.pl.yml	i18n: Make Polish translation more gender neutral + update (#8119)	6 years ago
devise.pt-BR.yml	Weblate translations (2018-03-09) (#6708)	7 years ago
devise.pt.yml	Weblate translations (2018-03-02) (#6588)	7 years ago
devise.ru.yml	Russian language updated (#6397)	7 years ago
devise.sk.yml	Weblate translations (2018-07-05) (#7950)	6 years ago
devise.sl.yml	Weblate translations (2018-07-11) (#7992)	6 years ago
devise.sr-Latn.yml	Adding Serbian latin translations (#6146)	7 years ago
devise.sr.yml	Adding Serbian translation (#6133)	7 years ago
devise.sv.yml	Weblate translations (2018-03-02) (#6588)	7 years ago
devise.th.yml	Add Thai langauge (#2903)	8 years ago
devise.uk.yml	Fix Ukrainian malformed locale submitted in #2893, i18n-tasks normalize (#2896)	8 years ago
devise.zh-CN.yml	Update Simplified Chinese translations (#6306)	7 years ago
devise.zh-HK.yml	Weblate translations (2018-06-02) (#7705)	7 years ago
devise.zh-TW.yml	Weblate translations (2018-06-25) (#7890)	6 years ago
doorkeeper.ar.yml	Weblate translations (2018-07-11) (#7992)	6 years ago
doorkeeper.ast.yml	Weblate translations (2018-09-13) (#8692)	6 years ago
doorkeeper.bg.yml	Oauth code in input form and add description message (#4986)	7 years ago
doorkeeper.ca.yml	Weblate translations 20180515 (#7496)	7 years ago
doorkeeper.co.yml	Weblate translations (2018-08-11) (#8167)	6 years ago
doorkeeper.cs.yml	Weblate translations (2018-08-11) (#8167)	6 years ago
doorkeeper.cy.yml	Weblate translations (2018-09-24) (#8768)	6 years ago
doorkeeper.da.yml	Weblate translations (2018-08-25) (#8420)	6 years ago
doorkeeper.de.yml	Weblate translations (2018-08-11) (#8167)	6 years ago
doorkeeper.el.yml	Weblate translations (2018-07-11) (#7992)	6 years ago
doorkeeper.en.yml	Introduce OAuth scopes for bookmarks	6 years ago
doorkeeper.eo.yml	Weblate translations (2018-07-18) (#8047)	6 years ago
doorkeeper.es.yml	Weblate translations (#6370)	7 years ago
doorkeeper.eu.yml	Weblate translations (2018-08-11) (#8167)	6 years ago
doorkeeper.fa.yml	Weblate translations (2018-06-16) (#7815)	6 years ago
doorkeeper.fi.yml	Weblate translations (2018-04-15) (#7141)	7 years ago
doorkeeper.fr.yml	Major update for the French translation (#8348)	6 years ago
doorkeeper.gl.yml	Weblate translations (2018-07-11) (#7992)	6 years ago
doorkeeper.he.yml	Weblate translations (#5922)	7 years ago
doorkeeper.hr.yml	Oauth code in input form and add description message (#4986)	7 years ago
doorkeeper.hu.yml	Weblate translations (2018-03-02) (#6588)	7 years ago
doorkeeper.id.yml	Weblate translations (2018-04-02) (#7007)	7 years ago
doorkeeper.io.yml	Oauth code in input form and add description message (#4986)	7 years ago
doorkeeper.it.yml	Weblate translations (2018-07-18) (#8047)	6 years ago
doorkeeper.ja.yml	Weblate translations (2018-07-14) (#8016)	6 years ago
doorkeeper.ka.yml	Add Georgian language translation (#8250)	6 years ago
doorkeeper.nl.yml	Weblate translations (2018-07-11) (#7992)	6 years ago
doorkeeper.no.yml	Weblate translations (#6370)	7 years ago
doorkeeper.oc.yml	Weblate translations (2018-07-11) (#7992)	6 years ago
doorkeeper.pl.yml	i18n: Make Polish translation more gender neutral + update (#8119)	6 years ago
doorkeeper.pt-BR.yml	Weblate translations (2018-07-14) (#8016)	6 years ago
doorkeeper.pt.yml	Weblate translations (#6228)	7 years ago
doorkeeper.ro.yml	Weblate translations (2018-09-02) (#8577)	6 years ago
doorkeeper.ru.yml	[RU] Translation update: (#8147)	6 years ago
doorkeeper.sk.yml	Weblate translations (2018-07-11) (#7992)	6 years ago
doorkeeper.sl.yml	Weblate translations (2018-07-25) (#8065)	6 years ago
doorkeeper.sr-Latn.yml	Adding Serbian latin translations (#6146)	7 years ago
doorkeeper.sr.yml	Adding Serbian translation (#6133)	7 years ago
doorkeeper.sv.yml	Weblate translations (2018-07-05) (#7950)	6 years ago
doorkeeper.th.yml	Oauth code in input form and add description message (#4986)	7 years ago
doorkeeper.uk.yml	Weblate translations (2018-08-22) (#8346)	6 years ago
doorkeeper.zh-CN.yml	i18n: Update Simplified Chinese translations (#7565)	7 years ago
doorkeeper.zh-HK.yml	Weblate translations 20180515 (#7496)	7 years ago
doorkeeper.zh-TW.yml	Weblate translations (2018-06-25) (#7890)	6 years ago
el.yml	Add "disable" button to report screen (#9024)	6 years ago
en.yml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
en_GB.yml	Weblate translations (2018-09-13) (#8692)	6 years ago
eo.yml	Add "disable" button to report screen (#9024)	6 years ago
es.yml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
eu.yml	Add "disable" button to report screen (#9024)	6 years ago
fa.yml	Add "disable" button to report screen (#9024)	6 years ago
fi.yml	Add "disable" button to report screen (#9024)	6 years ago
fr.yml	Add "disable" button to report screen (#9024)	6 years ago
gl.yml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
he.yml	Add "disable" button to report screen (#9024)	6 years ago
hr.yml	Update /terms and /about/more to use public layout (#8142)	6 years ago
hu.yml	Add "disable" button to report screen (#9024)	6 years ago
id.yml	Add "disable" button to report screen (#9024)	6 years ago
io.yml	Add "disable" button to report screen (#9024)	6 years ago
it.yml	Add "disable" button to report screen (#9024)	6 years ago
ja.yml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ka.yml	Add "disable" button to report screen (#9024)	6 years ago
ko.yml	Add "disable" button to report screen (#9024)	6 years ago
ms.yml	Weblate translations (2018-06-25) (#7890)	6 years ago
nl.yml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
no.yml	Add "disable" button to report screen (#9024)	6 years ago
oc.yml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
pl.yml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
pt-BR.yml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
pt.yml	Add "disable" button to report screen (#9024)	6 years ago
ro.yml	Weblate translations (2018-09-02) (#8577)	6 years ago
ru.yml	Add "disable" button to report screen (#9024)	6 years ago
simple_form.ar.yml	Weblate translations (2018-10-12) (#8972)	6 years ago
simple_form.ast.yml	Weblate translations (2018-09-19) (#8731)	6 years ago
simple_form.bg.yml	Fix size/dimension values in avatar/header hint localizations (#8088)	6 years ago
simple_form.ca.yml	Fix broken report detail (regression from #8569) (#8795)	6 years ago
simple_form.co.yml	Weblate translations (2018-10-12) (#8972)	6 years ago
simple_form.cs.yml	Weblate translations (2018-10-12) (#8972)	6 years ago
simple_form.cy.yml	Fix broken report detail (regression from #8569) (#8795)	6 years ago
simple_form.da.yml	Fix broken report detail (regression from #8569) (#8795)	6 years ago
simple_form.de.yml	Weblate translations (2018-10-12) (#8972)	6 years ago
simple_form.el.yml	Weblate translations (2018-10-12) (#8972)	6 years ago
simple_form.en.yml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
simple_form.en_GB.yml	Weblate translations (2018-09-13) (#8692)	6 years ago
simple_form.eo.yml	Fix broken report detail (regression from #8569) (#8795)	6 years ago
simple_form.es.yml	Fix broken report detail (regression from #8569) (#8795)	6 years ago
simple_form.eu.yml	Fix broken report detail (regression from #8569) (#8795)	6 years ago
simple_form.fa.yml	Weblate translations (2018-10-12) (#8972)	6 years ago
simple_form.fi.yml	Fix broken report detail (regression from #8569) (#8795)	6 years ago
simple_form.fr.yml	Weblate translations (2018-10-12) (#8972)	6 years ago
simple_form.gl.yml	Weblate translations (2018-10-12) (#8972)	6 years ago
simple_form.he.yml	Fix size/dimension values in avatar/header hint localizations (#8088)	6 years ago
simple_form.hr.yml	Fix size/dimension values in avatar/header hint localizations (#8088)	6 years ago
simple_form.hu.yml	Fix size/dimension values in avatar/header hint localizations (#8088)	6 years ago
simple_form.id.yml	Fix size/dimension values in avatar/header hint localizations (#8088)	6 years ago
simple_form.io.yml	Fix size/dimension values in avatar/header hint localizations (#8088)	6 years ago
simple_form.it.yml	Fix broken report detail (regression from #8569) (#8795)	6 years ago
simple_form.ja.yml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
simple_form.ka.yml	Fix broken report detail (regression from #8569) (#8795)	6 years ago
simple_form.ko.yml	Fix broken report detail (regression from #8569) (#8795)	6 years ago
simple_form.nl.yml	Fix broken report detail (regression from #8569) (#8795)	6 years ago
simple_form.no.yml	Fix size/dimension values in avatar/header hint localizations (#8088)	6 years ago
simple_form.oc.yml	Fix broken report detail (regression from #8569) (#8795)	6 years ago
simple_form.pl.yml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
simple_form.pt-BR.yml	Fix broken report detail (regression from #8569) (#8795)	6 years ago
simple_form.pt.yml	Fix size/dimension values in avatar/header hint localizations (#8088)	6 years ago
simple_form.ro.yml	Fix broken report detail (regression from #8569) (#8795)	6 years ago
simple_form.ru.yml	Fix broken report detail (regression from #8569) (#8795)	6 years ago
simple_form.sk.yml	Fix broken report detail (regression from #8569) (#8795)	6 years ago
simple_form.sl.yml	Fix size/dimension values in avatar/header hint localizations (#8088)	6 years ago
simple_form.sr-Latn.yml	Fix size/dimension values in avatar/header hint localizations (#8088)	6 years ago
simple_form.sr.yml	Fix broken report detail (regression from #8569) (#8795)	6 years ago
simple_form.sv.yml	Fix broken report detail (regression from #8569) (#8795)	6 years ago
simple_form.th.yml	Fix size/dimension values in avatar/header hint localizations (#8088)	6 years ago
simple_form.tr.yml	Fix size/dimension values in avatar/header hint localizations (#8088)	6 years ago
simple_form.uk.yml	Weblate translations (2018-08-22) (#8346)	6 years ago
simple_form.zh-CN.yml	Fix broken report detail (regression from #8569) (#8795)	6 years ago
simple_form.zh-HK.yml	Fix broken report detail (regression from #8569) (#8795)	6 years ago
simple_form.zh-TW.yml	Fix broken report detail (regression from #8569) (#8795)	6 years ago
sk.yml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
sl.yml	Update /terms and /about/more to use public layout (#8142)	6 years ago
sr-Latn.yml	Add "disable" button to report screen (#9024)	6 years ago
sr.yml	Add "disable" button to report screen (#9024)	6 years ago
sv.yml	Add "disable" button to report screen (#9024)	6 years ago
te.yml	Weblate translations 20180503 (#7325)	7 years ago
th.yml	Add "disable" button to report screen (#9024)	6 years ago
tr.yml	Add "disable" button to report screen (#9024)	6 years ago
uk.yml	Add "disable" button to report screen (#9024)	6 years ago
zh-CN.yml	Add "disable" button to report screen (#9024)	6 years ago
zh-HK.yml	Add "disable" button to report screen (#9024)	6 years ago
zh-TW.yml	Add "disable" button to report screen (#9024)	6 years ago