174 Commits (2c578a01d86ef65d1b0117f6fff32a6b57463dde)

Author	SHA1	Message	Date
David Yip	071c2c9c85	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss	7 years ago
Eugen Rochko	0b7a0d15c7	Bump version to 2.2.0rc1	7 years ago
Eugen Rochko	872a0d5bd8	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	2ca965c704	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	9b3b40df66	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	89a9d629f7	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: Gemfile.lock	7 years ago
Eugen Rochko	5276c0a090	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	0c7dc6c781	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	ed867eca9d	Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252)	7 years ago
Jenkins	7c719c567c	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	ff6ca8bdc6	Bump version to 2.1.3	7 years ago
Jenkins	f6adb409fd	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	e9822a4e4e	Bump version to 2.1.2	7 years ago
Jenkins	c69a23ae46	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	7571c37c99	Bump version to 2.1.1 (#6164)	7 years ago
Jenkins	f77c47d01b	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	cafe27fb29	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	05a2a70ca2	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
beatrix	e202efdf8a	Merge pull request #253 from glitch-soc/prevent-local-only-federation ... prevent federation of local-only statuses	7 years ago
Daigo 3 Dango	a434d9c0cc	Remove period from the version number (#6039) ... 2.1.0. -> 2.1.0	7 years ago
David Yip	82b2e224a2	Merge branch 'gs-master' into prevent-local-only-federation ... Conflicts: db/schema.rb	7 years ago
Jenkins	40afadfb01	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	a29432f0cd	Bump version to 2.1.0 🎆	7 years ago
Jenkins	37254c4f5d	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	098c7d27fe	Bump version to 2.1.0rc6	7 years ago
Jenkins	10f800ab46	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	7cad926401	Bump version to 2.1.0rc5	7 years ago
Jenkins	82236a3703	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	57fcc21a86	Bump version to 2.1.0rc4	7 years ago
David Yip	a057ed5cfe	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	7 years ago
David Yip	1138d0c321	Add Rake task to backfill local-only flag (#253)	7 years ago
Eugen Rochko	2526ef10c2	Bump version to 2.1.0rc3	7 years ago
Jenkins	776867ea73	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	369f40bb9f	Bump version to 2.1.0rc2	7 years ago
Jenkins	744447b3c0	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Akihiko Odaki	c083816c24	Add embed_url to preview cards (#5775)	7 years ago
Jenkins	8ca91cef45	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	f9a0d8f2b9	Bump version to 2.1.0rc1 (#5834)	7 years ago
Yamagishi Kazutoshi	b21db9bbde	Using double splat operator (#5859)	7 years ago
David Yip	b28b405b97	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
ysksn	9dd5e329ab	Remove empty strings (#5732)	7 years ago
Surinna Curtis	35fbdc36f9	Merge tootsuite/master at 3023725936	7 years ago
Eugen Rochko	7bb8b0b2fc	Add moderator role and add pundit policies for admin actions (#5635) ... * Add moderator role and add pundit policies for admin actions * Add rake task for turning user into mod and revoking it again * Fix handling of unauthorized exception * Deliver new report e-mails to staff, not just admins * Add promote/demote to admin UI, hide some actions conditionally * Fix unused i18n	7 years ago
Naoki Kosaka	4c0a85ef9b	In remove_remote, exclude removed media attachments. (#5626)	7 years ago
David Yip	dd28b94cf0	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
unarist	4f337c020a	Fix Cocaine::ExitStatusError when upload small non-animated GIF (#5489) ... Looks like copied tempfile need to be flushed before further processing. This issue won't happen if the uploaded file has enough file size.	7 years ago
David Yip	42e8c8eb0e	Merge tag 'v2.0.0' into gs-master	7 years ago
Eugen Rochko	3810d98cd8	Bump version to 2.0.0 🐘	7 years ago
Eugen Rochko	637ea3bb5b	Bump version to 2.0.0rc4	7 years ago
David Yip	65154869df	Merge remote-tracking branch 'upstream/master' into upstream-merge-again	7 years ago