182 Commits (e365675e0a8d2b01bab397e6462e301ef57280e5)

Author	SHA1	Message	Date
Jenkins	06d2bfd63f	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Akihiko Odaki	5892127534	Require environment for generate_static_pages (#6420) ... It is required for ApplicationController.	7 years ago
David Yip	87517e2dd8	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml	7 years ago
Eugen Rochko	9d2cb4d12d	Bump version to 2.2.0	7 years ago
Eugen Rochko	9c212f0f28	ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)	7 years ago
Jenkins	3cd4a0804b	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	de667c2a95	Bump to 2.2.0rc2	7 years ago
Eugen Rochko	8f60c22ba4	Fix #6311: Replace relative URLs in CSS only for Premailer (#6335)	7 years ago
David Yip	03f157f6da	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss	7 years ago
Eugen Rochko	b9794f1a49	Bump version to 2.2.0rc1	7 years ago
Eugen Rochko	896cadceed	Improve HTML e-mails based on Litmus tests (#6301) ... * Use PNG images in HTML e-mails * Make webpack use URLs with host so fonts load inside HTML e-mails Convert this back to a relative URL in the premailer CSS loader since local requests are quicker * Improve responsive design * Add missing PNG icon	7 years ago
David Yip	d45ebe26dc	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss	7 years ago
Eugen Rochko	92df0bba59	Fix regeneration marker not expiring (#6290) ... * Fix regeneration key not getting expired * Add rake task to remove old regeneration markers	7 years ago
David Yip	de7283a318	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: Gemfile.lock	7 years ago
Eugen Rochko	9613c3238c	HTML e-mails for UserMailer (#6256) ... - premailer gem to turn CSS into inline styles automatically - rework UserMailer templates - reword UserMailer templates	7 years ago
Jenkins	6e821c4273	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	67ee638c28	Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252)	7 years ago
Jenkins	f9a0b246e5	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	87dd894cf4	Bump version to 2.1.3	7 years ago
Jenkins	86007e913d	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	76268627c2	Bump version to 2.1.2	7 years ago
Jenkins	796a39a283	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	a0273c2c5e	Bump version to 2.1.1 (#6164)	7 years ago
Jenkins	503e7fb4d8	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	50f2d69780	Add rake task to check and purge accounts that are missing in origin (#6085) ... * Add rake task to check and purge accounts that are missing in origin * Add progress bar and --force options to mastodon:maintenance:purge_removed_accounts	7 years ago
Jenkins	b47a89be89	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
beatrix	978e5e5606	Merge pull request #253 from glitch-soc/prevent-local-only-federation ... prevent federation of local-only statuses	7 years ago
Daigo 3 Dango	64ae134e7b	Remove period from the version number (#6039) ... 2.1.0. -> 2.1.0	7 years ago
David Yip	d53f727653	Merge branch 'gs-master' into prevent-local-only-federation ... Conflicts: db/schema.rb	7 years ago
Jenkins	ebfca67b98	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	b23c9ab7de	Bump version to 2.1.0 🎆	7 years ago
Jenkins	601f0fe4a3	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	1079099d2b	Bump version to 2.1.0rc6	7 years ago
Jenkins	ac183e024b	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	d4849787c5	Bump version to 2.1.0rc5	7 years ago
Jenkins	1366e96a02	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	cae49f11c7	Bump version to 2.1.0rc4	7 years ago
David Yip	a56c9ac5dc	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	7 years ago
David Yip	234dc012d0	Add Rake task to backfill local-only flag (#253)	7 years ago
Eugen Rochko	a6fdeedb47	Bump version to 2.1.0rc3	7 years ago
Jenkins	c6572ed6c8	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	3126869f5a	Bump version to 2.1.0rc2	7 years ago
Jenkins	099159741b	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Akihiko Odaki	ce3989fc6a	Add embed_url to preview cards (#5775)	7 years ago
Jenkins	a3a7b6a848	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	11a9900269	Bump version to 2.1.0rc1 (#5834)	7 years ago
Yamagishi Kazutoshi	fba46b6072	Using double splat operator (#5859)	7 years ago
David Yip	5f689cdf78	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
ysksn	08cb63c360	Remove empty strings (#5732)	7 years ago
Surinna Curtis	02ae609d9a	Merge tootsuite/master at ab48f2b239	7 years ago