69 Commits (25cfabce267f95ecfae6663626fe5b88d537a6ff)

Author SHA1 Message Date
Thibaut Girka 5c8f9a3220 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko c84c30c542 Improve blocked view of profiles (#10491)
6 years ago
Eugen Rochko d48f53cf1a Fix admin validation being too strict about usernames (#10449)
6 years ago
Thibaut Girka 5eb2632410 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 4cd944d364 Hide blocking accounts from blocked users (#10442)
6 years ago
Thibaut Girka 1f70b51fff Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka e97d76632d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko a8bb10633d Add `blocked_by` relationship to the REST API (#10373)
6 years ago
Eugen Rochko b4c64dcccc Add custom closed registrations message to landing page when set (#10347)
6 years ago
Thibaut Girka 741766a01d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 73fb7bfa0f Admission-based registrations mode (#10250)
6 years ago
Thibaut Girka d86033c352 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
mayaeh 9d214f30ae Fix to limit to discoverable accounts. (#10253)
6 years ago
Eugen Rochko 56822606f4 Redesign landing page (#10232)
6 years ago
Thibaut Girka 91934eeb74 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 9f3f47e91f Improved remote thread fetching (#10106)
6 years ago
Thibaut Girka 77b9249250 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 81536e07ab Don't count suspended users in user count (#9380)
6 years ago
Thibaut Girka 478abe3a58 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko a217abb71c Cast status_count to integer (#9314)
6 years ago
Eugen Rochko 62c0e112ea Extract counters from accounts table to account_stats table (#9295)
6 years ago
Thibaut Girka 74e411f4e8 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ashleyhull-versent ea57aca5e1 Replace SVG asset with Custom mascot (#8766)
6 years ago
Thibaut Girka 69212ed0ad Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 94b7dddeac Add admin custom CSS setting (#8399)
6 years ago
Thibaut Girka 5ed6f6db1d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 6e3cb11f3c Public profile endorsements (accounts picked by profile owner) (#8146)
6 years ago
Thibaut Girka 30c9fef4d4 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 934d50daf0 Add separate setting for sidebar text (site_short_description) (#8107)
6 years ago
Jenkins 3fc6e7dabb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 93b8db8f08 Better pagination for ActivityPub outbox (#7356)
7 years ago
Thibaut Girka 12f8473561 Add backend support for bookmarks
7 years ago
imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko ad1f541bd7 Redesign landing page (again) (#6486)
7 years ago
Eugen Rochko cdb12bd39b Fix bug in relationships API introduced by #6482 (#6527)
7 years ago
Jenkins e768ef35b1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 750f3e64c9 Cache relationships in API (#6482)
7 years ago
Jenkins a3a7b6a848 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi fba46b6072 Using double splat operator (#5859)
7 years ago
Ondřej Hruška 0cc795db6b Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream
7 years ago
Ondřej Hruška 914c0465b1 Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream
7 years ago
Daigo 3 Dango 7e6322863c Compact status_ids in StatusRelationshipsPresenter (#5073)
7 years ago
nullkal e5a634f940 Use OrderedCollectionPage to return followers/following list (#4949)
7 years ago
Akihiko Odaki f4e3449e61 Use Account.local.sum(statuses_count) instead of Status.local.count (#4996)
7 years ago
Eugen Rochko 9ff429aa6d Uploads for admin site settings (#4913)
7 years ago
David Yip 67d9178007 Merge tag 'v1.6.0rc3' into sync/upstream
7 years ago
David Yip da3f22ee7d Merge branch 'origin/master' into sync/upstream
7 years ago
Eugen Rochko 181cbbcaf8 Fix #4794 - Fake instant follow in API response when account is believed unlocked (#4799)
7 years ago
Eugen Rochko 3e20cb7025 Pinned statuses (#4675)
7 years ago
Daigo 3 Dango fd9d66dfd4 Add Mastodon::Source.url (#4643)
7 years ago