95 Commits (36d27e289177fdec5332539c94b8192022a412f2)

Author SHA1 Message Date
Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 73be8f38c1
Add profile directory (#9427)
6 years ago
Thibaut Girka f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko d6b9a62e0a
Extract counters from accounts table to account_stats table (#9295)
6 years ago
Thibaut Girka d17844e6d1 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ashleyhull-versent f194857ac9 rubocop issues - Cleaning up (#8912)
6 years ago
Eugen Rochko 774ac47373
Add conversations API (#8832)
6 years ago
Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
aus-social 1f98eae1cf Lint pass (#8876)
6 years ago
Thibaut Girka 43d132039b Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 5e1767173f
Display pending message on admin relays UI (#8494)
6 years ago
Thibaut Girka 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 8e111b753a
Move status counters to separate table, count replies (#8104)
6 years ago
Thibaut Girka e5a603206d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko f2404de871
Public profile endorsements (accounts picked by profile owner) (#8146)
6 years ago
Thibaut Girka f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko e55dce3176
Add federation relay support (#7998)
6 years ago
Thibaut Girka 402da8065c Migrate glitch-soc keyword mutes to Mastodon's
6 years ago
Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge
6 years ago
Eugen Rochko cdb101340a
Keyword/phrase filtering (#7905)
6 years ago
Thibaut Girka e0ef89c73f Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Shuhei Kitagawa 12e590edd7 Add tests for report notes controller (#7589)
7 years ago
Thibaut Girka b481e4fac1 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 8378b72eba
Ensure push subscription is immediately removed when application is revoked (#7548)
7 years ago
David Yip c816701550
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko c5dcd7d836
Speed up test suite by not generating RSA keys in test environment (#7296)
7 years ago
Thibaut Girka 09240810b4 Add spec for bookmark endpoints
7 years ago
Jenkins 837b3804bf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki b2a4ffd3a9 Change columns in notifications nonnullable (#6764)
7 years ago
Jenkins 2edf7128f2 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki f8f0572ee0 Do not push status to feed if its reblog is already inserted (#6488)
7 years ago
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko 61ed133fea
Account archive download (#6460)
7 years ago
David Yip a6fb1c58ee
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 26f21fd5a0
CAS + SAML authentication feature (#6425)
7 years ago
David Yip a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Akihiko Odaki e56323a4dd Remove preview_card fabricator (#5975)
7 years ago
David Yip e77c3996a5
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 740f8a95a9
Add consumable invites (#5814)
7 years ago
Jenkins 167fe2ab08 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko e84fecb7e9
Add logging of admin actions (#5757)
7 years ago
David Yip 1ab12ba38e Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 24cafd73a2
Lists (#5703)
7 years ago
Surinna Curtis 35fbdc36f9 Merge tootsuite/master at 3023725936
7 years ago
ysksn 4112a0631f Add tests for Setting (#5683)
7 years ago
ysksn 60f247c2e7 Add tests for SessionActivation (#5668)
7 years ago
David Yip ad86c86fa8 Apply keyword mutes to reblogs.
7 years ago
David Yip 670e6a33f8 Move KeywordMute into Glitch namespace.
7 years ago
David Yip 9093e2de7a Add KeywordMute model.
7 years ago
nullkal 633426b261 Add moderation note (#5240)
7 years ago