157 Commits (4c682228ce26dad545569e77099c8ece2bbce078)

Author SHA1 Message Date
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
7 years ago
Daigo 3 Dango 64ae134e7b Remove period from the version number (#6039)
7 years ago
David Yip d53f727653 Merge branch 'gs-master' into prevent-local-only-federation
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
Eugen Rochko 97178b6d86 Add moderator role and add pundit policies for admin actions (#5635)
7 years ago
Naoki Kosaka bc20bea20e In remove_remote, exclude removed media attachments. (#5626)
7 years ago
David Yip d3db08b69f Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
unarist 4472c5723a Fix Cocaine::ExitStatusError when upload small non-animated GIF (#5489)
7 years ago
David Yip dd4f9f18cb Merge tag 'v2.0.0' into gs-master
7 years ago
Eugen Rochko b222a9d5ee Bump version to 2.0.0 🐘
7 years ago
Eugen Rochko cb48c98e02 Bump version to 2.0.0rc4
7 years ago
David Yip 6f54953c07 Merge remote-tracking branch 'upstream/master' into upstream-merge-again
7 years ago
Eugen Rochko 7603119d3a Bump version to 2.0.0rc3
7 years ago
Ondřej Hruška 132a22ace5 Merge remote-tracking branch 'upstream/master'
7 years ago
aschmitz 93e3eaf95d Fix #5329 (#5332)
7 years ago
kibigo! 02827345ae Merge upstream 2.0ish #165
7 years ago
Eugen Rochko 03457653e9 Bump version to 2.0.0rc2
7 years ago
Eugen Rochko 522fa878c3 Fix #5274 - Create symlink from public/500.html to public/assets/500.html (#5288)
7 years ago
Eugen Rochko 2e9c614e77 Bump version to 2.0.0rc1 (#5209)
7 years ago
Eugen Rochko 007fce8c10 Set snowflake IDs for backdated statuses (#5260)
7 years ago
DJ Sundog f7f61a36d3 raise Mastodon::ValidationError if audio file duration is over 60 secs
7 years ago
DJ Sundog d50635d3be update indentation
7 years ago
DJ Sundog c3e5510289 adding support for audio uploads, transcoded to mp4 videos
7 years ago
Nolan Lawson 2b34471d9d Compress and combine emoji data (#5229)
7 years ago
Eugen Rochko 27fd33256c Clean up code style of Mastodon::TimestampId module (#5232)
7 years ago
aschmitz 5b2d855d86 Non-Serial ("Snowflake") IDs (#4801)
7 years ago
aschmitz 04fde500e6 Make IdsToBigints (mostly!) non-blocking (#5088)
7 years ago
Yamagishi Kazutoshi 12b7306a03 Upgrade Webpacker to version 3.0.1 (#5122)
7 years ago
nullkal 463bbe870f Refactor 500 file generation for future extension (#5105)
7 years ago