55 Commits (48062329973398fe5b12cadcc389c8602f1bb17f)

Author SHA1 Message Date
Thibaut Girka 2267eee356 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 9d3c6f1849 Improved remote thread fetching (#10106)
6 years ago
Thibaut Girka ad7a3974cc Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 81f96c973a
Don't count suspended users in user count (#9380)
6 years ago
Thibaut Girka f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 0c666ae5e6
Cast status_count to integer (#9314)
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 2dba313100 Replace SVG asset with Custom mascot (#8766)
6 years ago
Thibaut Girka 246c313d45 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko a2cabf3f4a
Add admin custom CSS setting (#8399)
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 bf1d3ae3b8 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko cc56f2230a
Add separate setting for sidebar text (site_short_description) (#8107)
6 years ago
Jenkins cb62935c0b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
6 years ago
Eugen Rochko 2c1f7b2ece
Better pagination for ActivityPub outbox (#7356)
6 years ago
Thibaut Girka 50eb8f1f61 Add backend support for bookmarks
7 years ago
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko c71aa468b5
Redesign landing page (again) (#6486)
7 years ago
Eugen Rochko 4bc625166e
Fix bug in relationships API introduced by #6482 (#6527)
7 years ago
Jenkins 1445ba1703 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko cba2897108
Cache relationships in API (#6482)
7 years ago
Jenkins 8ca91cef45 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi b21db9bbde Using double splat operator (#5859)
7 years ago
Ondřej Hruška 83bda6c1a8
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
7 years ago
Ondřej Hruška 9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
7 years ago
Daigo 3 Dango ab625c57ce Compact status_ids in StatusRelationshipsPresenter (#5073)
7 years ago
nullkal 7d16bb379d Use OrderedCollectionPage to return followers/following list (#4949)
7 years ago
Akihiko Odaki 9619b7f727 Use Account.local.sum(statuses_count) instead of Status.local.count (#4996)
7 years ago
Eugen Rochko 9239e4ce4d Uploads for admin site settings (#4913)
7 years ago
David Yip 514fc908a3 Merge tag 'v1.6.0rc3' into sync/upstream
7 years ago
David Yip b9f7bc149b Merge branch 'origin/master' into sync/upstream
7 years ago
Eugen Rochko 9b994c4aee Fix #4794 - Fake instant follow in API response when account is believed unlocked (#4799)
7 years ago
Eugen Rochko 9caa90025f Pinned statuses (#4675)
7 years ago
Daigo 3 Dango 696c2c6f2f Add Mastodon::Source.url (#4643)
7 years ago
Eugen Rochko 3c6503038e Add protocol handler. Handle follow intents (#4511)
7 years ago
Ondřej Hruška b7cf758fbe Fix JS errors and add back commit hash
7 years ago
Ondřej Hruška c727eae441 Updated from tootsuite
7 years ago
Eugen Rochko a6328fc1b1 Minor ActivityPub JSON fixes (#4214)
7 years ago
kibigo! 09cfc079b0 Merge upstream (#81)
7 years ago
Eugen Rochko 8c45cd0e36 Improve ActivityPub representations (#3844)
7 years ago
unarist 1896a154f5 Fix response of unreblog/unfavourite APIs (#4204)
7 years ago
Sorin Davidoi 0c7c188c45 Web Push Notifications (#3243)
7 years ago
kibigo! 79d898ae0a Merge upstream!! #64 <3 <3
7 years ago
DJ Sundog 74eff5456c First lame pass at adding optional git commit hash display on /about/… (#67)
7 years ago
Eugen Rochko e19eefe219 Redesign the landing page, mount public timeline on it (#4122)
7 years ago
Eugen Rochko 864e3f8d9c Replace OEmbed and initial state Rabl templates with serializers (#4110)
7 years ago
Eugen Rochko 8b2cad5637 Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)
7 years ago
Yamagishi Kazutoshi 275c5b51ed Customizable privacy policy from admin interface (#4062)
7 years ago