lain
b38c3de411
Gitlab CI: Update postgres
2020-11-19 17:15:05 +01:00
lain
783fa797bb
SearchController Test: Fix test
2020-11-19 16:53:26 +01:00
lain
81b6f02a5e
Search Test: linting
2020-11-19 16:48:51 +01:00
lain
3b86ad0744
Changelog: Document breaking change.
2020-11-19 16:26:17 +01:00
lain
4a5ab690ef
Config: Set search_function to websearch by default
2020-11-19 16:17:14 +01:00
lain
1c16c67c21
Cheatsheet: Add info about search_function
2020-11-19 16:16:55 +01:00
lain
1bad91cba2
Changelog: Add info about the websearch option
2020-11-19 16:13:53 +01:00
lain
a60242464e
Search: Add option to search with the websearch function
2020-11-19 16:12:01 +01:00
lain
6f9b03384f
Merge branch 'hide-muted-reactions' into 'develop'
...
Hide reactions from muted and blocked users
Closes #1875
See merge request pleroma/pleroma!3147
2020-11-19 10:58:28 +00:00
8a7ee9fe74
Merge branch 'revert-da4660d2' into 'develop'
...
Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"
See merge request pleroma/pleroma!3158
2020-11-18 21:16:12 +00:00
42ff5ea95e
Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"
...
This reverts merge request !2955
2020-11-18 20:32:30 +00:00
minibikini
6669ac5bf7
Merge branch 'develop' into 'hide-muted-reactions'
...
# Conflicts:
# CHANGELOG.md
2020-11-18 20:22:40 +00:00
Mark Felder
1d03ba4ffb
Fixed emoji reactions not being filtered from blocked and muted accounts
2020-11-18 20:13:25 +00:00
a1056aace1
Merge branch 'fix/mix-task-user-delete_activities' into 'develop'
...
Fix mix pleroma.user delete_activities task
See merge request pleroma/pleroma!3156
2020-11-18 18:57:47 +00:00
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
2020-11-18 18:33:48 +00:00
lain
1b63aa0b4f
Apply 1 suggestion(s) to 1 file(s)
2020-11-18 18:27:30 +00:00
lain
6b32e1de23
Merge branch 'frontend-admin-api' into 'develop'
...
Add an API to manage frontends
Closes #2238
See merge request pleroma/pleroma!3108
2020-11-18 17:51:57 +00:00
lain
d7b63272b8
Changelog: Move api info to api heading.
2020-11-18 18:32:13 +01:00
fe7008ee39
Merge branch 'update/admin-fe-20201117' into 'develop'
...
Update AdminFE
See merge request pleroma/pleroma!3157
2020-11-17 23:16:17 +00:00
Mark Felder
ad7fc35252
Update AdminFE build to pleroma/admin-fe@5b38aea279
2020-11-17 17:01:34 -06:00
Mark Felder
415481a4d9
Add test for POST when push is disabled
...
Also group together the tests verifiying failure when disabled
2020-11-17 22:18:22 +00:00
Mark Felder
3eaa5335c9
Revert adding extra alert types here
2020-11-17 21:37:17 +00:00
Mark Felder
d9732fb7d3
Fix incorrect test description
2020-11-17 21:34:18 +00:00
Mark Felder
ccddedb504
Credo
2020-11-17 20:33:30 +00:00
Mark Felder
ff7a4b6aa2
Test that we ignore invalid subscription alert types separately.
2020-11-17 20:22:25 +00:00
Mark Felder
30f140e570
Ensure all supported push notification subscription alert types are tested
2020-11-17 20:22:25 +00:00
Mark Felder
499faa82f6
Synchronize reaction notification text with PleromaFE's style
2020-11-17 20:22:24 +00:00
Mark Felder
5d0bc5e028
Support both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push/subscription
2020-11-17 20:21:48 +00:00
Mark Felder
67a6abd071
Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions
2020-11-17 20:20:00 +00:00
Mark Felder
80e21903d4
Spelling
2020-11-17 20:20:00 +00:00
Mark Felder
1433d3c59c
Document the API extensions for push subscriptions
2020-11-17 20:20:00 +00:00
Mark Felder
83ec2f1384
Allow subscribing for pleroma:emoji_reaction push notifications
2020-11-17 20:20:00 +00:00
Mark Felder
3ce11b830e
Add capability for emoji reaction push notifications
2020-11-17 20:20:00 +00:00
lain
e6d4d62f85
Docs: Add info about frontend install error response
2020-11-17 16:44:20 +01:00
lain
bb9650f3c2
FrontendController: Return error on installation error.
2020-11-17 16:43:07 +01:00
Mark Felder
56d95203b5
Document fixing the pleroma.user delete_activities mix task
2020-11-17 15:28:46 +00:00
Mark Felder
97201f7e37
Need to start web_resp cache or mix task fails
2020-11-17 15:15:53 +00:00
d33b9e7b33
Merge branch 'remove/fedsockets' into 'develop'
...
Remove FedSockets
See merge request pleroma/pleroma!3155
2020-11-17 14:58:33 +00:00
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
2020-11-17 14:52:08 +00:00
Egor Kislitsyn
f69fe36ebf
Merge branch 'develop' into frontend-admin-api
2020-11-17 18:34:04 +04:00
Egor Kislitsyn
d48dbfab2b
Merge remote-tracking branch 'origin/develop' into hide-muted-reactions
2020-11-17 18:30:10 +04:00
Egor Kislitsyn
79d2d3f609
Merge branch 'develop' into hide-muted-reactions
2020-11-17 18:29:52 +04:00
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.
2020-11-17 17:28:30 +03:00
lain
61f86774d1
Merge branch 'chores/note-handling-move' into 'develop'
...
Chores/note handling move
See merge request pleroma/pleroma!3122
2020-11-17 14:16:53 +00:00
lain
fbd6217ed9
Merge branch 'feature/local-only-scope' into 'develop'
...
Add local-only statuses
Closes #75 and #1483
See merge request pleroma/pleroma!2289
2020-11-17 14:08:45 +00:00
lain
fec1ed802e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
2020-11-17 15:01:38 +01:00
rinpatch
9b9afe6b3f
Merge branch 'fix/debian-install-libmagic-typo' into 'develop'
...
Debian installation guide: fix libmagic header package name
See merge request pleroma/pleroma!3154
2020-11-17 13:24:01 +00:00
rinpatch
f711a41933
Debian installation guide: fix libmagic header package name
...
It's libmagic-dev in both Ubuntu and Debian.
Reported in private by NaiJi.
2020-11-17 16:11:37 +03:00
rinpatch
c7536f16cb
Merge branch 'feat/add-bundles-to-gitattributes' into 'develop'
...
.gitattributes: Treat js/css/source maps as binary files
See merge request pleroma/pleroma!3153
2020-11-17 12:55:09 +00:00
rinpatch
83ec4aadd6
Merge branch 'chores/tesla_1.4.0' into 'develop'
...
mix.exs: Update tesla to 1.4.0
See merge request pleroma/pleroma!3152
2020-11-17 12:42:51 +00:00
