195 Commits (1b8fcd4df52c8d715f89180faea8205310f197ae)

Author SHA1 Message Date
David Yip 1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Thomas Leister ecd36c1ede Fixes #6584 (#6585)
7 years ago
Eugen Rochko 64f2ada5d4
Bump version to 2.3.0rc1
7 years ago
Eugen Rochko 47bdb9b33b
Fix #942: Seamless LDAP login (#6556)
7 years ago
Paul Woolcock 76198c63b6 Some images can cause `convert` to fail, which crashes this whole task (#6565)
7 years ago
Eugen Rochko 5cc716688a
Ensure the app does not even start if OTP_SECRET is not set (#6557)
7 years ago
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko d3a62d2637
Fix #6525: Make sure file is opened in LazyThumbnail processor (#6529)
7 years ago
Eugen Rochko 61ed133fea
Account archive download (#6460)
7 years ago
takayamaki f69d7cb43b fix purge_removed_accounts task should suspend account before delete it (#6521)
7 years ago
Eugen Rochko a7171af0a3
Fix avatar and header issues by using custom geometry detector (#6515)
7 years ago
Jenkins 5ffa6f0fa1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko cf36d184f4
Interactive `rake mastodon:setup` task (#6451)
7 years ago
Jenkins 530fcc1c14 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki f7bf36d8fc Require environment for generate_static_pages (#6420)
7 years ago
David Yip f4b2478af1
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko e14c20582f
Bump version to 2.2.0
7 years ago
Eugen Rochko 97dcfb0f50
ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)
7 years ago
Jenkins 0e10667fbe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko e6db3427b7
Bump to 2.2.0rc2
7 years ago
Eugen Rochko b1daa71da5
Fix #6311: Replace relative URLs in CSS only for Premailer (#6335)
7 years ago
David Yip 071c2c9c85
Merge remote-tracking branch 'origin/master' into merge-upstream
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)
7 years ago
David Yip 2ca965c704
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 9b3b40df66
Fix regeneration marker not expiring (#6290)
7 years ago
David Yip 89a9d629f7
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 5276c0a090
HTML e-mails for UserMailer (#6256)
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)
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
7 years ago
Daigo 3 Dango a434d9c0cc Remove period from the version number (#6039)
7 years ago
David Yip 82b2e224a2
Merge branch 'gs-master' into prevent-local-only-federation
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