239 Commits (390cfdef2e81f8d3a58c4a5e1d1656e8484f395d)

Author SHA1 Message Date
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
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)
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)
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
Eugen Rochko bc89995f65 Bump version to 2.0.0rc3
7 years ago
Ondřej Hruška 0bf9261e65
Merge remote-tracking branch 'upstream/master'
7 years ago
aschmitz e5d8166a12 Fix #5329 (#5332)
7 years ago
kibigo! 8d6b9ba494 Merge upstream 2.0ish #165
7 years ago
Eugen Rochko 7c33da45f0 Bump version to 2.0.0rc2
7 years ago
Eugen Rochko 92e7815d1d Fix #5274 - Create symlink from public/500.html to public/assets/500.html (#5288)
7 years ago
Eugen Rochko 0aa810f9c8 Bump version to 2.0.0rc1 (#5209)
7 years ago
Eugen Rochko 0717d9b3e6 Set snowflake IDs for backdated statuses (#5260)
7 years ago
DJ Sundog 85d5da86df raise Mastodon::ValidationError if audio file duration is over 60 secs
7 years ago
DJ Sundog e10cff8226 update indentation
7 years ago
DJ Sundog 96ba3482b9 adding support for audio uploads, transcoded to mp4 videos
7 years ago
Nolan Lawson fd7f0732fe Compress and combine emoji data (#5229)
7 years ago
Eugen Rochko eb5ac23434 Clean up code style of Mastodon::TimestampId module (#5232)
7 years ago
aschmitz 468523f4ad Non-Serial ("Snowflake") IDs (#4801)
7 years ago
aschmitz 97c02c3389 Make IdsToBigints (mostly!) non-blocking (#5088)
7 years ago
Yamagishi Kazutoshi 901fc48aae Upgrade Webpacker to version 3.0.1 (#5122)
7 years ago
nullkal b32a1d5754 Refactor 500 file generation for future extension (#5105)
7 years ago
Eugen Rochko 3b60832214 New error page graphic. Other error page improvements (#5099)
7 years ago
Eugen Rochko 510df0ac55 Fix emojify() by generating a mapping to existing Twemoji files (#5080)
7 years ago
Yamagishi Kazutoshi 0fea700c7b Refresh manifest before generate 500.html (#5090)
7 years ago
Eugen Rochko 2c8e3fbbfb Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067)
7 years ago
Eugen Rochko 1e02ba111a Add emoji autosuggest (#5053)
7 years ago
Eugen Rochko efec507230 Bump to 1.6.1
7 years ago
Eugen Rochko 54edb4b853 When accessing uncached media attachment, redownload it (#4955)
7 years ago
abcang 1aad015bbb Revert unique retry job (#4937)
7 years ago
Eugen Rochko 0a6b098668 Fix count numbers from ActivityPub not being saved (#4899)
7 years ago
Eugen Rochko ab71cf4593 Bump to 1.6.0
7 years ago
Eugen Rochko 4819e2913d Bump version to 1.6.0rc5
7 years ago
Eugen Rochko 2ff7146b6d Bump version to 1.6.0rc4
7 years ago
Joseph Mingrone 5264496240 Use casecmp() instead of casecmp?() for now (#4832)
7 years ago
Eugen Rochko dd5cb5085c Bump version to 1.6.0rc2
7 years ago
abcang be7ffa2d75 Do not execute the job with the same arguments as the retry job (#4814)
7 years ago
Akihiko Odaki a789315361 Use next instead of return in task (#4787)
7 years ago
Akihiko Odaki 249bdc169c Explicitly define attached file of DeprecatedPreviewCard (#4786)
7 years ago
Eugen Rochko 9dd8dff683 Bump version to 1.6.0rc1 (#4768)
7 years ago