159 Commits (8713659dffc884c65376091d3731c8074ac581e4)

Author SHA1 Message Date
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