mastodon

History

Thibaut Girka 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.		2018-12-18 16:55:15 +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	…
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.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.sr-Latn.yml	…
activerecord.sr.yml	…
activerecord.sv.yml	…
activerecord.th.yml	…
activerecord.uk.yml	…
activerecord.zh-CN.yml	…
activerecord.zh-HK.yml	…
ar.yml	Remove "most popular" tab from profile directory, add responsive design (#9539 )	2018-12-17 03:14:28 +01:00
ast.yml	Weblate translations (2018-12-13) (#9513 )	2018-12-13 16:59:51 +01:00
bg.yml	Weblate translations (2018-11-27) (#9367 )	2018-11-27 12:50:26 +01:00
ca.yml	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-15 10:45:53 +01:00
co.yml	Remove "most popular" tab from profile directory, add responsive design (#9539 )	2018-12-17 03:14:28 +01:00
cs.yml	Remove "most popular" tab from profile directory, add responsive design (#9539 )	2018-12-17 03:14:28 +01:00
cy.yml	Weblate translations (2018-11-27) (#9367 )	2018-11-27 12:50:26 +01:00
da.yml	Weblate translations (2018-11-27) (#9367 )	2018-11-27 12:50:26 +01:00
de.yml	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-15 10:45:53 +01:00
devise.ar.yml	Weblate translations (2018-11-27) (#9367 )	2018-11-27 12:50:26 +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	Add consistent interpolations check to CircleCI (#9072 )	2018-10-25 01:17:01 +02:00
devise.co.yml	…
devise.cs.yml	I18n: Correct pluralization of Czech (#9527 )	2018-12-15 17:08:54 +09:00
devise.cy.yml	Weblate translations (2018-10-26) (#9113 )	2018-10-29 13:20:29 +01:00
devise.da.yml	…
devise.de.yml	…
devise.el.yml	…
devise.en.yml	…
devise.eo.yml	…
devise.es.yml	…
devise.eu.yml	…
devise.fa.yml	…
devise.fi.yml	…
devise.fr.yml	security/l10n [fr] do not leak registered e-mail addresses (#9375 )	2018-11-27 16:40:39 +01:00
devise.gl.yml	…
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	…
devise.ja.yml	Add consistent interpolations check to CircleCI (#9072 )	2018-10-25 01:17:01 +02:00
devise.ka.yml	…
devise.nl.yml	Weblate translations (2018-12-13) (#9513 )	2018-12-13 16:59:51 +01:00
devise.no.yml	Add consistent interpolations check to CircleCI (#9072 )	2018-10-25 01:17:01 +02:00
devise.oc.yml	[i18n] update and corrections for Occitan locale (#9404 )	2018-12-01 17:39:13 +01:00
devise.pl.yml	Update i18n-tasks and change CircleCI command (#9104 )	2018-10-28 07:15:20 +01:00
devise.pt-BR.yml	Add consistent interpolations check to CircleCI (#9072 )	2018-10-25 01:17:01 +02:00
devise.pt.yml	…
devise.ru.yml	…
devise.sk.yml	…
devise.sl.yml	…
devise.sr-Latn.yml	…
devise.sr.yml	…
devise.sv.yml	…
devise.th.yml	…
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	…
doorkeeper.cy.yml	Weblate translations (2018-10-26) (#9113 )	2018-10-29 13:20:29 +01:00
doorkeeper.da.yml	…
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.nl.yml	…
doorkeeper.no.yml	…
doorkeeper.oc.yml	…
doorkeeper.pl.yml	…
doorkeeper.pt-BR.yml	…
doorkeeper.pt.yml	…
doorkeeper.ro.yml	…
doorkeeper.ru.yml	…
doorkeeper.sk.yml	…
doorkeeper.sl.yml	…
doorkeeper.sr-Latn.yml	…
doorkeeper.sr.yml	…
doorkeeper.sv.yml	…
doorkeeper.th.yml	…
doorkeeper.uk.yml	…
doorkeeper.zh-CN.yml	…
doorkeeper.zh-HK.yml	…
doorkeeper.zh-TW.yml	…
el.yml	Remove "most popular" tab from profile directory, add responsive design (#9539 )	2018-12-17 03:14:28 +01:00
en.yml	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-18 16:55:15 +01:00
en_GB.yml	Update i18n-tasks and change CircleCI command (#9104 )	2018-10-28 07:15:20 +01:00
eo.yml	Weblate translations (2018-12-13) (#9513 )	2018-12-13 16:59:51 +01:00
es.yml	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-27 13:23:02 +01:00
eu.yml	Remove "most popular" tab from profile directory, add responsive design (#9539 )	2018-12-17 03:14:28 +01:00
fa.yml	Weblate translations (2018-11-27) (#9367 )	2018-11-27 12:50:26 +01:00
fi.yml	Redesign admin accounts index (#9340 )	2018-11-26 15:53:27 +01:00
fr.yml	Remove "most popular" tab from profile directory, add responsive design (#9539 )	2018-12-17 03:14:28 +01:00
gl.yml	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-18 16:55:15 +01:00
he.yml	Weblate translations (2018-11-27) (#9367 )	2018-11-27 12:50:26 +01:00
hr.yml	Weblate translations (2018-11-27) (#9367 )	2018-11-27 12:50:26 +01:00
hu.yml	Redesign admin accounts index (#9340 )	2018-11-26 15:53:27 +01:00
id.yml	Weblate translations (2018-11-27) (#9367 )	2018-11-27 12:50:26 +01:00
io.yml	Weblate translations (2018-11-27) (#9367 )	2018-11-27 12:50:26 +01:00
it.yml	Redesign admin accounts index (#9340 )	2018-11-26 15:53:27 +01:00
ja.yml	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-18 16:55:15 +01:00
ka.yml	Redesign admin accounts index (#9340 )	2018-11-26 15:53:27 +01:00
ko.yml	Redesign admin accounts index (#9340 )	2018-11-26 15:53:27 +01:00
ms.yml	Remove unused translations (#9372 )	2018-11-27 13:38:03 +01:00
nl.yml	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-18 16:55:15 +01:00
no.yml	Redesign admin accounts index (#9340 )	2018-11-26 15:53:27 +01:00
oc.yml	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-18 16:55:15 +01:00
pl.yml	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-18 16:55:15 +01:00
pt-BR.yml	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-27 13:23:02 +01:00
pt.yml	Redesign admin accounts index (#9340 )	2018-11-26 15:53:27 +01:00
ro.yml	Weblate translations (2018-10-26) (#9113 )	2018-10-29 13:20:29 +01:00
ru.yml	Redesign admin accounts index (#9340 )	2018-11-26 15:53:27 +01:00
simple_form.ar.yml	Remove character counter from edit profile (#9100 )	2018-10-26 01:55:24 +02: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 (2018-12-13) (#9513 )	2018-12-13 16:59:51 +01:00
simple_form.co.yml	Weblate translations (2018-12-13) (#9513 )	2018-12-13 16:59:51 +01:00
simple_form.cs.yml	Weblate translations (2018-12-13) (#9513 )	2018-12-13 16:59:51 +01:00
simple_form.cy.yml	Weblate translations (2018-10-26) (#9113 )	2018-10-29 13:20:29 +01:00
simple_form.da.yml	Weblate translations (2018-12-13) (#9513 )	2018-12-13 16:59:51 +01:00
simple_form.de.yml	Remove character counter from edit profile (#9100 )	2018-10-26 01:55:24 +02:00
simple_form.el.yml	Weblate translations (2018-12-13) (#9513 )	2018-12-13 16:59:51 +01:00
simple_form.en.yml	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +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 (2018-12-13) (#9513 )	2018-12-13 16:59:51 +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 (2018-12-13) (#9513 )	2018-12-13 16:59:51 +01:00
simple_form.fa.yml	Weblate translations (2018-11-27) (#9367 )	2018-11-27 12:50:26 +01:00
simple_form.fi.yml	Remove character counter from edit profile (#9100 )	2018-10-26 01:55:24 +02:00
simple_form.fr.yml	Weblate translations (2018-12-13) (#9513 )	2018-12-13 16:59:51 +01:00
simple_form.gl.yml	Weblate translations (2018-12-13) (#9513 )	2018-12-13 16:59:51 +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 (2018-12-13) (#9513 )	2018-12-13 16:59:51 +01:00
simple_form.ja.yml	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-15 10:45:53 +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 (2018-10-26) (#9113 )	2018-10-29 13:20:29 +01:00
simple_form.nl.yml	Weblate translations (2018-12-13) (#9513 )	2018-12-13 16:59:51 +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	[i18n] Update Occitan (#9491 )	2018-12-11 05:38:57 +01:00
simple_form.pl.yml	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
simple_form.pt-BR.yml	Weblate translations (2018-10-26) (#9113 )	2018-10-29 13:20:29 +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	…
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 (2018-12-13) (#9513 )	2018-12-13 16:59:51 +01:00
simple_form.sl.yml	Weblate translations (2018-11-27) (#9367 )	2018-11-27 12:50:26 +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 (2018-10-26) (#9113 )	2018-10-29 13:20:29 +01:00
simple_form.sv.yml	Remove character counter from edit profile (#9100 )	2018-10-26 01:55:24 +02:00
simple_form.th.yml	Remove character counter from edit profile (#9100 )	2018-10-26 01:55:24 +02:00
simple_form.tr.yml	Remove character counter from edit profile (#9100 )	2018-10-26 01:55:24 +02: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	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-18 16:55:15 +01:00
sl.yml	Weblate translations (2018-11-27) (#9367 )	2018-11-27 12:50:26 +01:00
sr-Latn.yml	Weblate translations (2018-11-27) (#9367 )	2018-11-27 12:50:26 +01:00
sr.yml	Weblate translations (2018-12-13) (#9513 )	2018-12-13 16:59:51 +01:00
sv.yml	Redesign admin accounts index (#9340 )	2018-11-26 15:53:27 +01:00
te.yml	Weblate translations (2018-11-27) (#9367 )	2018-11-27 12:50:26 +01:00
th.yml	Redesign admin accounts index (#9340 )	2018-11-26 15:53:27 +01:00
tr.yml	Weblate translations (2018-11-27) (#9367 )	2018-11-27 12:50:26 +01:00
uk.yml	Redesign admin accounts index (#9340 )	2018-11-26 15:53:27 +01:00
zh-CN.yml	Redesign admin accounts index (#9340 )	2018-11-26 15:53:27 +01:00
zh-HK.yml	Redesign admin accounts index (#9340 )	2018-11-26 15:53:27 +01:00
zh-TW.yml	Redesign admin accounts index (#9340 )	2018-11-26 15:53:27 +01:00