lain
6f9b03384f
Merge branch 'hide-muted-reactions' into 'develop'
...
Hide reactions from muted and blocked users
Closes #1875
See merge request pleroma/pleroma!3147
4 years ago
Alexander Strizhakov
4aaffe3a10
log capture
4 years ago
Alexander Strizhakov
8a8c154b4e
test fixes
4 years ago
Alexander Strizhakov
44f3795b8e
changelog entries for fixes
4 years ago
Alexander Strizhakov
be0b874e1d
fix for mastodon forwarded reports
4 years ago
Alexander Strizhakov
a840aefda8
formatting
4 years ago
Alexander Strizhakov
e2bf6b1f7e
fix for forwarded reports
4 years ago
feld
8a7ee9fe74
Merge branch 'revert-da4660d2' into 'develop'
...
Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"
See merge request pleroma/pleroma!3158
4 years ago
Mark Felder
3e7642b123
Update AdminFE build to pleroma/admin-fe@c18f167a124c31ab2e1dfbf432ac482b17c01cbd
4 years ago
feld
42ff5ea95e
Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"
...
This reverts merge request !2955
4 years ago
minibikini
6669ac5bf7
Merge branch 'develop' into 'hide-muted-reactions'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Mark Felder
1d03ba4ffb
Fixed emoji reactions not being filtered from blocked and muted accounts
4 years ago
feld
a1056aace1
Merge branch 'fix/mix-task-user-delete_activities' into 'develop'
...
Fix mix pleroma.user delete_activities task
See merge request pleroma/pleroma!3156
4 years ago
lain
aae669d05e
Merge branch 'fix/webpush-and-emojireact' into 'develop'
...
Push notifications: add pleroma:emoji_reaction, improve tests
Closes #2185
See merge request pleroma/pleroma!3141
4 years ago
lain
1b63aa0b4f
Apply 1 suggestion(s) to 1 file(s)
4 years ago
lain
6b32e1de23
Merge branch 'frontend-admin-api' into 'develop'
...
Add an API to manage frontends
Closes #2238
See merge request pleroma/pleroma!3108
4 years ago
lain
d7b63272b8
Changelog: Move api info to api heading.
4 years ago
Maksim Pechnikov
9c5d1cb9ed
fix tests
4 years ago
Maksim
3c00af82dc
Apply 1 suggestion(s) to 1 file(s)
4 years ago
Maksim
137b7f9e28
Apply 1 suggestion(s) to 1 file(s)
4 years ago
Maksim
e91e2399ee
Apply 1 suggestion(s) to 1 file(s)
4 years ago
Maksim
ce11f0bc33
Apply 1 suggestion(s) to 1 file(s)
4 years ago
Maksim
25eb222bed
Apply 1 suggestion(s) to 1 file(s)
4 years ago
feld
fe7008ee39
Merge branch 'update/admin-fe-20201117' into 'develop'
...
Update AdminFE
See merge request pleroma/pleroma!3157
4 years ago
Mark Felder
ad7fc35252
Update AdminFE build to pleroma/admin-fe@5b38aea2790686647a39f505864331bb9838e20d
4 years ago
Mark Felder
415481a4d9
Add test for POST when push is disabled
...
Also group together the tests verifiying failure when disabled
4 years ago
Mark Felder
3eaa5335c9
Revert adding extra alert types here
4 years ago
Mark Felder
d9732fb7d3
Fix incorrect test description
4 years ago
Mark Felder
ccddedb504
Credo
4 years ago
Mark Felder
ff7a4b6aa2
Test that we ignore invalid subscription alert types separately.
4 years ago
Mark Felder
30f140e570
Ensure all supported push notification subscription alert types are tested
4 years ago
Mark Felder
499faa82f6
Synchronize reaction notification text with PleromaFE's style
4 years ago
Mark Felder
5d0bc5e028
Support both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push/subscription
4 years ago
Mark Felder
67a6abd071
Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions
4 years ago
Mark Felder
80e21903d4
Spelling
4 years ago
Mark Felder
1433d3c59c
Document the API extensions for push subscriptions
4 years ago
Mark Felder
83ec2f1384
Allow subscribing for pleroma:emoji_reaction push notifications
4 years ago
Mark Felder
3ce11b830e
Add capability for emoji reaction push notifications
4 years ago
lain
e6d4d62f85
Docs: Add info about frontend install error response
4 years ago
lain
bb9650f3c2
FrontendController: Return error on installation error.
4 years ago
Mark Felder
56d95203b5
Document fixing the pleroma.user delete_activities mix task
4 years ago
Mark Felder
97201f7e37
Need to start web_resp cache or mix task fails
4 years ago
feld
d33b9e7b33
Merge branch 'remove/fedsockets' into 'develop'
...
Remove FedSockets
See merge request pleroma/pleroma!3155
4 years ago
rinpatch
cf99b1c1fd
Merge branch 'release/just-a-test-for-arm32-on-arm64' into 'develop'
...
Specify the architecture for arm gitlab jobs
See merge request pleroma/pleroma!3139
4 years ago
Egor Kislitsyn
f69fe36ebf
Merge branch 'develop' into frontend-admin-api
4 years ago
Egor Kislitsyn
d48dbfab2b
Merge remote-tracking branch 'origin/develop' into hide-muted-reactions
4 years ago
Egor Kislitsyn
79d2d3f609
Merge branch 'develop' into hide-muted-reactions
4 years ago
rinpatch
2c55f7d7cb
Remove FedSockets
...
Current FedSocket implementation has a bunch of problems. It doesn't
have proper error handling (in case of an error the server just doesn't
respond until the connection is closed, while the client doesn't match
any error messages and just assumes there has been an error after 15s)
and the code is full of bad descisions (see: fetch registry which uses
uuids for no reason and waits for a response by recursively querying a
ets table until the value changes, or double JSON encoding).
Sometime ago I almost completed rewriting fedsockets from scrach to
adress these issues. However, while doing so, I realized that fedsockets
are just too overkill for what they were trying to accomplish, which is
reduce the overhead of federation by not signing every message.
This could be done without reimplementing failure states and endpoint
logic we already have with HTTP by, for example, using TLS cert auth,
or switching to a more performant signature algorithm. I opened
https://git.pleroma.social/pleroma/pleroma/-/issues/2262 for further
discussion on alternatives to fedsockets.
From discussions I had with other Pleroma developers it seems like they
would approve the descision to remove them as well,
therefore I am submitting this patch.
4 years ago
lain
61f86774d1
Merge branch 'chores/note-handling-move' into 'develop'
...
Chores/note handling move
See merge request pleroma/pleroma!3122
4 years ago
lain
fbd6217ed9
Merge branch 'feature/local-only-scope' into 'develop'
...
Add local-only statuses
Closes #75 and #1483
See merge request pleroma/pleroma!2289
4 years ago