FloatingGhost
32fbd2e4e3
fix all tests
2 years ago
FloatingGhost
c3ed86cd1e
fix emoji controller tests
2 years ago
FloatingGhost
142646426e
fix emoji tests
2 years ago
FloatingGhost
0f6bece60d
Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop
3 years ago
FloatingGhost
0d012ebea1
Revert "Merge branch 'remove/mastofe' into 'develop'"
...
This reverts commit 6b3842cf50
, reversing
changes made to 6b1282a829
.
3 years ago
FloatingGhost
8cc6359a85
Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop
3 years ago
FloatingGhost
25b4395830
just drop unknown tags
3 years ago
FloatingGhost
92d3742072
Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop
3 years ago
FloatingGhost
9ee27fb5ec
add bookwyrm entity tests
3 years ago
FloatingGhost
680c5d8d89
Add compatibility with bookwyrm's weird entities
3 years ago
Alex Gleason
2ae867842b
StreamerTest: tag erratic test
3 years ago
FloatingGhost
12a171844b
Merge remote-tracking branch 'upstream/develop' into develop
3 years ago
marcin mikołajczak
746c9daa62
Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
marcin mikołajczak
f734579965
MastoAPI: Add `GET /api/v1/accounts/lookup`
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
Alex Gleason
5c80d4087d
PleromaAPI.AppView: add test
3 years ago
Alex Gleason
cb2a072e62
Apps: add test for get_user_apps/1
3 years ago
Alex Gleason
2e4a1c56c3
AppController: test creating with and without a user
3 years ago
Alex Gleason
f5c3d45120
Merge remote-tracking branch 'origin/develop' into apps-api-endpoint
3 years ago
Alex Gleason
d61a5515e6
ConnectionPoolTest: tag erratic test
3 years ago
Alex Gleason
479fc5fff8
EnsureStaffPrivilegedPlug: add tests
3 years ago
Alex Gleason
913141379c
Merge branch 'profile-directory' into 'develop'
...
MastoAPI: Profile directory
See merge request pleroma/pleroma!3573
3 years ago
marcin mikołajczak
de006443f0
MastoAPI: Profile directory
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'
...
MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540
3 years ago
Alex Gleason
b96a58ff28
Merge branch 'account-subscriptions' into 'develop'
...
MastoAPI: accept notify param in follow request
See merge request pleroma/pleroma!3555
3 years ago
Alex Gleason
d9746ae4cb
Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop'
...
Handle Reject for already-accepted Follows properly
Closes #2766 and #2802
See merge request pleroma/pleroma!3568
3 years ago
Alex Gleason
9c1cb87eff
Merge branch 'erratic-tests' into 'develop'
...
Skip erratic tests
See merge request pleroma/pleroma!3572
3 years ago
Alex Gleason
2ce7dae6de
Skip erratic tests
3 years ago
Alex Gleason
b0d2b53934
Merge branch 'manifest' into 'develop'
...
Expose /manifest.json for PWA
Closes #882
See merge request pleroma/pleroma!3544
3 years ago
Alex Gleason
1ff9ffed83
Merge branch 'live-dashboard' into 'develop'
...
Add Phoenix LiveDashboard
See merge request pleroma/pleroma!3566
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'
...
V2 suggestions
See merge request pleroma/pleroma!3547
3 years ago
Tusooa Zhu
8376e83f61
Lint
3 years ago
Tusooa Zhu
951d1592c7
Add test to ensure removed follower cease to have relationship with ex-followee
...
https://git.pleroma.social/pleroma/pleroma/-/issues/2802
3 years ago
Tusooa Zhu
bfd870380c
Add test to ensure the blocked cease to have follow relationship to the blocker
...
https://git.pleroma.social/pleroma/pleroma/-/issues/2766
3 years ago
Tusooa Zhu
3d41ccc47b
Allow updating accepted follow activities in Web.ActivityPub.Utils.update_follow_state_for_all/2
...
Mastodon uses the Reject activity also for the purpose of removing
a follower, in addition to reject a follow request. We should
also update the original Follow activity in this case.
3 years ago
FloatingGhost
0c0ea169d4
Merge remote-tracking branch 'upstream/develop' into develop
3 years ago
Alex Gleason
e1b89fe3aa
Merge remote-tracking branch 'origin/develop' into live-dashboard
3 years ago
Alex Gleason
29d80b39f2
Add Phoenix LiveDashboard
...
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
3 years ago
lain
6eb7d69e60
Merge branch 'delete-account-fix' into 'develop'
...
TwitterAPI: allow deleting one's own account with request body
Closes #2799 and #2746
See merge request pleroma/pleroma!3564
3 years ago
Alex Gleason
8672ad6b00
TwitterAPI: allow deleting one's own account with request body
3 years ago
FloatingGhost
de60b1f3c1
make search provider configurable
3 years ago
Alex Gleason
938c95d75d
VideoHandlingTest: remove nil values
3 years ago
Haelwenn
ecab82dea7
Apply alexgleason's suggestion(s) to 1 file(s)
3 years ago
Alex Gleason
2936adbbce
Fix VideoHandlingTest
3 years ago
Alex Gleason
da83839dc1
AttachmentValidator: ingest width and height
3 years ago
Alex Gleason
494149f173
Transmogrifier: test fix_attachments/1
3 years ago
FloatingGhost
0fab887eee
make linter happy
3 years ago
FloatingGhost
429407ba0a
Make deactivated user check into a subquery
...
Fixes #2792
3 years ago