mastodon

History

Thibaut Girka 4df3b7cb06 Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/settings/follower_domains_controller.rb Removed upstream. Did the same here. Maybe we should not have? - config/locales/en.yml Upstream removed the “Authorized followers” page and associated translations. This is too close in the file to our glitch-soc-specific “flavour” string. No actual conflict. - config/locales/ja.yml Same as above. - config/locales/pl.yml Same as above. - config/navigation.rb No real conflict. New route added too close to the glitch-soc-specific “flavours” one. - config/webpack/configuration.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpack/loaders/babel.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. The contents of this file have been moved to package.json. - config/webpack/shared.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpacker.yml Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - jest.config.js The contents of this file have been moved to package.json. - package.json Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - yarn.lock Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up.		2019-03-16 14:14:20 +01:00
..
activerecord.ar.yml	…
activerecord.ast.yml	Weblate translations (2018-11-27) (#9367 )	2018-11-27 12:50:26 +01:00
activerecord.ca.yml	…
activerecord.co.yml	…
activerecord.cs.yml	…
activerecord.cy.yml	Weblate translations (2018-10-26) (#9113 )	2018-10-29 13:20:29 +01:00
activerecord.da.yml	…
activerecord.de.yml	…
activerecord.el.yml	…
activerecord.en.yml	Fix detailed poll validation errors not being returned in the API (#10261 )	2019-03-15 13:36:38 +01:00
activerecord.es.yml	…
activerecord.eu.yml	…
activerecord.fa.yml	…
activerecord.fr.yml	…
activerecord.gl.yml	…
activerecord.he.yml	…
activerecord.id.yml	…
activerecord.it.yml	…
activerecord.ja.yml	…
activerecord.ka.yml	…
activerecord.kk.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
activerecord.nl.yml	…
activerecord.no.yml	…
activerecord.oc.yml	…
activerecord.pl.yml	…
activerecord.pt-BR.yml	…
activerecord.pt.yml	…
activerecord.ru.yml	…
activerecord.sk.yml	…
activerecord.sl.yml	…
activerecord.sq.yml	Weblate translations (2019-02-11) (#10007 )	2019-02-11 07:41:35 +01:00
activerecord.sr-Latn.yml	…
activerecord.sr.yml	…
activerecord.sv.yml	…
activerecord.th.yml	…
activerecord.tr.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
activerecord.uk.yml	…
activerecord.zh-CN.yml	…
activerecord.zh-HK.yml	…
ar.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
ast.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
bg.yml	Redesign landing page (#10232 )	2019-03-12 17:34:00 +01:00
bn.yml	Redesign landing page (#10232 )	2019-03-12 17:34:00 +01:00
ca.yml	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-16 14:14:20 +01:00
co.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
cs.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
cy.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
da.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
de.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
devise.ar.yml	Weblate translations (2019-01-08) (#9758 )	2019-01-08 14:09:57 +01:00
devise.ast.yml	Weblate translations (2018-11-27) (#9367 )	2018-11-27 12:50:26 +01:00
devise.bg.yml	Add consistent interpolations check to CircleCI (#9072 )	2018-10-25 01:17:01 +02:00
devise.ca.yml	Weblate translations (2019-01-08) (#9758 )	2019-01-08 14:09:57 +01:00
devise.co.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
devise.cs.yml	I18n: Update Czech translation (#10272 )	2019-03-14 20:59:26 +01:00
devise.cy.yml	Weblate translations (2019-02-11) (#10007 )	2019-02-11 07:41:35 +01:00
devise.da.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
devise.de.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
devise.el.yml	Weblate translations (2019-01-08) (#9758 )	2019-01-08 14:09:57 +01:00
devise.en.yml	Admission-based registrations mode (#10250 )	2019-03-14 05:28:30 +01:00
devise.eo.yml	Weblate translations (2019-03-05) (#10180 )	2019-03-05 21:52:40 +01:00
devise.es.yml	…
devise.eu.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
devise.fa.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
devise.fi.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
devise.fr.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
devise.gl.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
devise.he.yml	Add consistent interpolations check to CircleCI (#9072 )	2018-10-25 01:17:01 +02:00
devise.hr.yml	Do not leak existence of e-mail addresses during login attempt, part 2 (#9376 )	2018-11-27 17:39:41 +01:00
devise.hu.yml	Add consistent interpolations check to CircleCI (#9072 )	2018-10-25 01:17:01 +02:00
devise.id.yml	…
devise.io.yml	Add consistent interpolations check to CircleCI (#9072 )	2018-10-25 01:17:01 +02:00
devise.it.yml	Weblate translations (2019-03-05) (#10180 )	2019-03-05 21:52:40 +01:00
devise.ja.yml	Rename from instance to server. (#9938 )	2019-02-05 19:11:24 +01:00
devise.ka.yml	…
devise.kk.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
devise.nl.yml	Weblate translations (2019-01-08) (#9758 )	2019-01-08 14:09:57 +01:00
devise.no.yml	Add consistent interpolations check to CircleCI (#9072 )	2018-10-25 01:17:01 +02:00
devise.oc.yml	Weblate translations (2019-03-05) (#10180 )	2019-03-05 21:52:40 +01:00
devise.pl.yml	Weblate translations (2019-01-15) (#9813 )	2019-01-15 15:30:30 +01:00
devise.pt-BR.yml	Weblate translations (2019-01-08) (#9758 )	2019-01-08 14:09:57 +01:00
devise.pt.yml	Weblate translations (2019-03-05) (#10180 )	2019-03-05 21:52:40 +01:00
devise.ru.yml	Weblate translations (2019-01-08) (#9758 )	2019-01-08 14:09:57 +01:00
devise.sk.yml	Weblate translations (2019-02-11) (#10007 )	2019-02-11 07:41:35 +01:00
devise.sl.yml	…
devise.sq.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
devise.sr-Latn.yml	…
devise.sr.yml	Weblate translations (2019-01-19) (#9867 )	2019-01-19 23:43:06 +01:00
devise.sv.yml	…
devise.th.yml	…
devise.tr.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
devise.uk.yml	Do not leak existence of e-mail addresses during login attempt, part 2 (#9376 )	2018-11-27 17:39:41 +01:00
devise.zh-CN.yml	…
devise.zh-HK.yml	Add consistent interpolations check to CircleCI (#9072 )	2018-10-25 01:17:01 +02:00
devise.zh-TW.yml	Weblate translations (2018-11-27) (#9367 )	2018-11-27 12:50:26 +01:00
doorkeeper.ar.yml	…
doorkeeper.ast.yml	Weblate translations (2018-11-27) (#9367 )	2018-11-27 12:50:26 +01:00
doorkeeper.bg.yml	…
doorkeeper.ca.yml	…
doorkeeper.co.yml	…
doorkeeper.cs.yml	Weblate translations (2019-03-05) (#10180 )	2019-03-05 21:52:40 +01:00
doorkeeper.cy.yml	Weblate translations (2018-10-26) (#9113 )	2018-10-29 13:20:29 +01:00
doorkeeper.da.yml	Weblate translations (2018-08-25) (#8420 )	2018-08-25 13:27:56 +02:00
doorkeeper.de.yml	…
doorkeeper.el.yml	…
doorkeeper.en.yml	…
doorkeeper.eo.yml	…
doorkeeper.es.yml	…
doorkeeper.eu.yml	…
doorkeeper.fa.yml	…
doorkeeper.fi.yml	…
doorkeeper.fr.yml	…
doorkeeper.gl.yml	…
doorkeeper.he.yml	…
doorkeeper.hr.yml	…
doorkeeper.hu.yml	…
doorkeeper.id.yml	…
doorkeeper.io.yml	…
doorkeeper.it.yml	…
doorkeeper.ja.yml	…
doorkeeper.ka.yml	…
doorkeeper.kk.yml	Weblate translations (2019-03-05) (#10180 )	2019-03-05 21:52:40 +01:00
doorkeeper.nl.yml	…
doorkeeper.no.yml	…
doorkeeper.oc.yml	…
doorkeeper.pl.yml	…
doorkeeper.pt-BR.yml	…
doorkeeper.pt.yml	…
doorkeeper.ro.yml	Weblate translations (2018-09-02) (#8577 )	2018-09-02 18:20:26 +02:00
doorkeeper.ru.yml	…
doorkeeper.sk.yml	…
doorkeeper.sl.yml	…
doorkeeper.sq.yml	Weblate translations (2019-02-11) (#10007 )	2019-02-11 07:41:35 +01:00
doorkeeper.sr-Latn.yml	…
doorkeeper.sr.yml	…
doorkeeper.sv.yml	…
doorkeeper.th.yml	…
doorkeeper.tr.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
doorkeeper.uk.yml	…
doorkeeper.zh-CN.yml	…
doorkeeper.zh-HK.yml	…
doorkeeper.zh-TW.yml	…
el.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
en.yml	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-16 14:14:20 +01:00
en_GB.yml	Update i18n-tasks and change CircleCI command (#9104 )	2018-10-28 07:15:20 +01:00
eo.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
es.yml	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-16 14:14:20 +01:00
eu.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
fa.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
fi.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
fr.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
ga.yml	Weblate translations (2019-02-11) (#10007 )	2019-02-11 07:41:35 +01:00
gl.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
he.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
hi.yml	Weblate translations (2018-12-27) (#9642 )	2018-12-27 12:25:30 +01:00
hr.yml	Redesign landing page (#10232 )	2019-03-12 17:34:00 +01:00
hu.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
id.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
io.yml	Admission-based registrations mode (#10250 )	2019-03-14 05:28:30 +01:00
it.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
ja.yml	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-16 14:14:20 +01:00
ka.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
kk.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
ko.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
lt.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
lv.yml	Weblate translations (2019-01-08) (#9758 )	2019-01-08 14:09:57 +01:00
ms.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
nl.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
no.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
oc.yml	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-16 14:14:20 +01:00
pl.yml	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-16 14:14:20 +01:00
pt-BR.yml	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-16 14:14:20 +01:00
pt.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
ro.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
ru.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
simple_form.ar.yml	Weblate translations (2019-03-05) (#10180 )	2019-03-05 21:52:40 +01:00
simple_form.ast.yml	Weblate translations (2018-11-27) (#9367 )	2018-11-27 12:50:26 +01:00
simple_form.bg.yml	Remove character counter from edit profile (#9100 )	2018-10-26 01:55:24 +02:00
simple_form.ca.yml	Weblate translations (2019-01-08) (#9758 )	2019-01-08 14:09:57 +01:00
simple_form.co.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
simple_form.cs.yml	Weblate translations (2019-03-05) (#10180 )	2019-03-05 21:52:40 +01:00
simple_form.cy.yml	Weblate translations (2019-02-11) (#10007 )	2019-02-11 07:41:35 +01:00
simple_form.da.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
simple_form.de.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
simple_form.el.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
simple_form.en.yml	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-10 21:10:09 +01:00
simple_form.en_GB.yml	Update i18n-tasks and change CircleCI command (#9104 )	2018-10-28 07:15:20 +01:00
simple_form.eo.yml	Weblate translations (2019-03-05) (#10180 )	2019-03-05 21:52:40 +01:00
simple_form.es.yml	Remove character counter from edit profile (#9100 )	2018-10-26 01:55:24 +02:00
simple_form.eu.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
simple_form.fa.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
simple_form.fi.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
simple_form.fr.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
simple_form.gl.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
simple_form.he.yml	Remove character counter from edit profile (#9100 )	2018-10-26 01:55:24 +02:00
simple_form.hr.yml	Remove character counter from edit profile (#9100 )	2018-10-26 01:55:24 +02:00
simple_form.hu.yml	Remove character counter from edit profile (#9100 )	2018-10-26 01:55:24 +02:00
simple_form.id.yml	Remove character counter from edit profile (#9100 )	2018-10-26 01:55:24 +02:00
simple_form.io.yml	Remove character counter from edit profile (#9100 )	2018-10-26 01:55:24 +02:00
simple_form.it.yml	Weblate translations (2019-03-05) (#10180 )	2019-03-05 21:52:40 +01:00
simple_form.ja.yml	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-10 21:10:09 +01:00
simple_form.ka.yml	Remove character counter from edit profile (#9100 )	2018-10-26 01:55:24 +02:00
simple_form.ko.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
simple_form.nl.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
simple_form.no.yml	Remove character counter from edit profile (#9100 )	2018-10-26 01:55:24 +02:00
simple_form.oc.yml	Weblate translations (2019-03-05) (#10180 )	2019-03-05 21:52:40 +01:00
simple_form.pl.yml	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-10 21:10:09 +01:00
simple_form.pt-BR.yml	Weblate translations (2019-01-08) (#9758 )	2019-01-08 14:09:57 +01:00
simple_form.pt.yml	Remove character counter from edit profile (#9100 )	2018-10-26 01:55:24 +02:00
simple_form.ro.yml	Weblate translations (2019-01-08) (#9758 )	2019-01-08 14:09:57 +01:00
simple_form.ru.yml	Remove character counter from edit profile (#9100 )	2018-10-26 01:55:24 +02:00
simple_form.sk.yml	Weblate translations (2019-03-05) (#10180 )	2019-03-05 21:52:40 +01:00
simple_form.sl.yml	Weblate translations (2019-02-11) (#10007 )	2019-02-11 07:41:35 +01:00
simple_form.sq.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
simple_form.sr-Latn.yml	Weblate translations (2018-10-26) (#9113 )	2018-10-29 13:20:29 +01:00
simple_form.sr.yml	Weblate translations (2019-01-19) (#9867 )	2019-01-19 23:43:06 +01:00
simple_form.sv.yml	Weblate translations (2019-03-05) (#10180 )	2019-03-05 21:52:40 +01:00
simple_form.th.yml	Remove character counter from edit profile (#9100 )	2018-10-26 01:55:24 +02:00
simple_form.tr.yml	Weblate translations (2019-02-23) (#10103 )	2019-02-23 18:41:28 +01:00
simple_form.uk.yml	Remove character counter from edit profile (#9100 )	2018-10-26 01:55:24 +02:00
simple_form.zh-CN.yml	Remove character counter from edit profile (#9100 )	2018-10-26 01:55:24 +02:00
simple_form.zh-HK.yml	Remove character counter from edit profile (#9100 )	2018-10-26 01:55:24 +02:00
simple_form.zh-TW.yml	Remove character counter from edit profile (#9100 )	2018-10-26 01:55:24 +02:00
sk.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
sl.yml	Redesign landing page (#10232 )	2019-03-12 17:34:00 +01:00
sq.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
sr-Latn.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
sr.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
sv.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
te.yml	Redesign landing page (#10232 )	2019-03-12 17:34:00 +01:00
th.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
tr.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
uk.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
zh-CN.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
zh-HK.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00
zh-TW.yml	Add relationship manager UI (#10268 )	2019-03-16 11:23:22 +01:00