0f6bece60d
Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop
3 years ago
0d012ebea1
Revert "Merge branch 'remove/mastofe' into 'develop'"
...
This reverts commit 6b3842cf506b1282a829
3 years ago
8cc6359a85
Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop
3 years ago
25b4395830
just drop unknown tags
3 years ago
34780cf182
Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop
3 years ago
2cc6b1e1bd
Allow for varying name fields
3 years ago
5c48fe1138
make credo happy
3 years ago
92d3742072
Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop
3 years ago
9ee27fb5ec
add bookwyrm entity tests
3 years ago
680c5d8d89
Add compatibility with bookwyrm's weird entities
3 years ago
3252ed0f54
format
3 years ago
4e8ee48cff
delete activities
3 years ago
12a171844b
Merge remote-tracking branch 'upstream/develop' into develop
3 years ago
1657db656c
AccountController.lookup: skip auth
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
0dd1caa841
AccountController.lookup: skip visibility check
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
746c9daa62
Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
f734579965
MastoAPI: Add `GET /api/v1/accounts/lookup`
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
de7f84deb3
Merge branch 'apps-api-endpoint' into 'develop'
...
Apps API endpoint
See merge request pleroma/pleroma!3583
3 years ago
7704a722c0
AppController: remove unnecessary `require Logger`
3 years ago
2e4a1c56c3
AppController: test creating with and without a user
3 years ago
f5c3d45120
Merge remote-tracking branch 'origin/develop' into apps-api-endpoint
3 years ago
138f5a4517
EnsureStaffPrivilegedPlug: don't let non-moderators through
3 years ago
a3fa987611
AdminAPI: fix duplicated routes
3 years ago
f02715c4b2
Fix lint errors
3 years ago
f66675f349
API: fix duplicate :get_password_token route
3 years ago
1c223331fc
API: show info about privileged staff in instance metadata
3 years ago
cd1041c3a4
API: optionally restrict moderators from accessing sensitive data
3 years ago
913141379c
Merge branch 'profile-directory' into 'develop'
...
MastoAPI: Profile directory
See merge request pleroma/pleroma!3573
3 years ago
de006443f0
MastoAPI: Profile directory
3 years ago
db2bf55e9b
Merge remote-tracking branch 'origin/develop' into notice-routes
3 years ago
73609211a4
Merge branch 'account-notes' into 'develop'
...
MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540
3 years ago
b96a58ff28
Merge branch 'account-subscriptions' into 'develop'
...
MastoAPI: accept notify param in follow request
See merge request pleroma/pleroma!3555
3 years ago
9775955974
Merge remote-tracking branch 'origin/develop' into remote-follow-api
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
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
3f8fc34593
Merge remote-tracking branch 'origin/develop' into moderators
3 years ago
50892a198d
Merge branch 'mkljczk-develop-patch-64464' into 'develop'
...
Add "exposable_reactions" to features, if showing reactions
See merge request pleroma/pleroma!3523
3 years ago
b0d2b53934
Merge branch 'manifest' into 'develop'
...
Expose /manifest.json for PWA
Closes #882
See merge request pleroma/pleroma!3544
3 years ago
df5359aa72
Merge branch 'replies-count' into 'develop'
...
Fix replies count for remote replies
See merge request pleroma/pleroma!3541
3 years ago
d1510c98d7
Merge branch 'link-headers-chats' into 'develop'
...
Add link headers in ChatController.index2
See merge request pleroma/pleroma!3562
3 years ago
1ff9ffed83
Merge branch 'live-dashboard' into 'develop'
...
Add Phoenix LiveDashboard
See merge request pleroma/pleroma!3566
3 years ago
e4f9cb1c1b
Merge remote-tracking branch 'origin/develop' into manifest
3 years ago
bd853199d9
Merge branch 'v2-suggestions' into 'develop'
...
V2 suggestions
See merge request pleroma/pleroma!3547
3 years ago
7c1d804554
Merge branch 'fix-search-dos' into 'develop'
...
Search: limit number of results (prevent DoS)
See merge request pleroma/pleroma!3563
3 years ago
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
0c0ea169d4
Merge remote-tracking branch 'upstream/develop' into develop
3 years ago
e1b89fe3aa
Merge remote-tracking branch 'origin/develop' into live-dashboard
3 years ago
29d80b39f2
Add Phoenix LiveDashboard
...
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
3 years ago
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
8f78cb3050
Merge branch 'develop' of gitssh.ihatebeinga.live:IHBAGang/pleroma into develop
3 years ago
5d901c337e
fix inbound federation
3 years ago
FloatingGhost