Commit Graph

13976 Commits (2e2fb5f8026a8d70f5d64dcc94f8253a5db24020)
 

Author SHA1 Message Date
Alex Gleason 2e2fb5f802 Merge branch 'ci-dont-retry' into 'develop'
3 years ago
Alex Gleason 913141379c Merge branch 'profile-directory' into 'develop'
3 years ago
marcin mikołajczak de006443f0 MastoAPI: Profile directory
3 years ago
Alex Gleason 0eb6e858f7 Merge branch 'notice-routes' into 'develop'
3 years ago
Alex Gleason cac4ed5eb0
GitLab CI: don't retry failed jobs
3 years ago
Alex Gleason 2c06eff519
Pleroma.Web.base_url() --> Endpoint.url()
3 years ago
Alex Gleason db2bf55e9b
Merge remote-tracking branch 'origin/develop' into notice-routes
3 years ago
Alex Gleason 73609211a4 Merge branch 'account-notes' into 'develop'
3 years ago
Alex Gleason b96a58ff28 Merge branch 'account-subscriptions' into 'develop'
3 years ago
Alex Gleason b4291bce8a Merge branch 'remote-follow-api' into 'develop'
3 years ago
marcin mikołajczak 9775955974 Merge remote-tracking branch 'origin/develop' into remote-follow-api
3 years ago
Alex Gleason 1fa616638b Merge branch 'warnings-as-errors' into 'develop'
3 years ago
Alex Gleason 2caade10df Merge branch 'add-nodeinfo-doc' into 'develop'
3 years ago
Hakaba Hitoyo 87871ac857 Add initial Nodeinfo document
3 years ago
Alex Gleason d9746ae4cb Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop'
3 years ago
Alex Gleason 05c7a14101 Merge branch 'moderators' into 'develop'
3 years ago
Alex Gleason 9c1cb87eff Merge branch 'erratic-tests' into 'develop'
3 years ago
Alex Gleason 2ce7dae6de
Skip erratic tests
3 years ago
Alex Gleason 3f8fc34593
Merge remote-tracking branch 'origin/develop' into moderators
3 years ago
Alex Gleason 50892a198d Merge branch 'mkljczk-develop-patch-64464' into 'develop'
3 years ago
Alex Gleason b0d2b53934 Merge branch 'manifest' into 'develop'
3 years ago
Alex Gleason df5359aa72 Merge branch 'replies-count' into 'develop'
3 years ago
Alex Gleason d1510c98d7 Merge branch 'link-headers-chats' into 'develop'
3 years ago
Alex Gleason 1ff9ffed83 Merge branch 'live-dashboard' into 'develop'
3 years ago
Alex Gleason e4f9cb1c1b
Merge remote-tracking branch 'origin/develop' into manifest
3 years ago
Alex Gleason bd853199d9 Merge branch 'v2-suggestions' into 'develop'
3 years ago
Alex Gleason 7c1d804554 Merge branch 'fix-search-dos' into 'develop'
3 years ago
lain b686d68cdb Merge branch 'from/develop/tusooa/alpine-3.14' into 'develop'
3 years ago
Tusooa Zhu ff17884c3b
Bump alpine to 3.14
3 years ago
Tusooa Zhu 8376e83f61
Lint
3 years ago
Tusooa Zhu 538d5ac210
Add changelog for https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3568
3 years ago
Tusooa Zhu 951d1592c7
Add test to ensure removed follower cease to have relationship with ex-followee
3 years ago
Tusooa Zhu bfd870380c
Add test to ensure the blocked cease to have follow relationship to the blocker
3 years ago
Tusooa Zhu 3d41ccc47b
Allow updating accepted follow activities in Web.ActivityPub.Utils.update_follow_state_for_all/2
3 years ago
lain 8cfd527589 Merge branch 'verbose-emoji-loader' into 'develop'
3 years ago
a1batross 31b9034a27 emoji/loader.ex: be more verbose about which emoji pack config is loading now
3 years ago
Alex Gleason e1b89fe3aa
Merge remote-tracking branch 'origin/develop' into live-dashboard
3 years ago
Alex Gleason 29d80b39f2
Add Phoenix LiveDashboard
3 years ago
lain 6eb7d69e60 Merge branch 'delete-account-fix' into 'develop'
3 years ago
Alex Gleason 8672ad6b00
TwitterAPI: allow deleting one's own account with request body
3 years ago
Alex Gleason 108dfd1f87
Search: limit number of results
3 years ago
marcin mikołajczak dff435488d Add link headers in ChatController.index2
3 years ago
lain fb0aa0661c Merge branch 'fix-attachment-dimensions' into 'develop'
3 years ago
lain 60295b58f9 Merge branch 'benchmark-fixes' into 'develop'
3 years ago
Alex Gleason d194b5b7fe
Benchmarks: fix user timeline and tags benchmarks
3 years ago
Alex Gleason 01cc099c8e
VideoHandlingTest: remove nil values
3 years ago
Haelwenn 992d9287d0 Apply alexgleason's suggestion(s) to 1 file(s)
3 years ago
Alex Gleason 2c96668a2c
Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensions
3 years ago
Alex Gleason 335684182a
Fix VideoHandlingTest
3 years ago
lain b57041c59a Merge branch 'fixyfix' into 'develop'
3 years ago