aries
63924ee712
Fix static_dir docs
5 years ago
kaniini
7271b2a954
Merge branch 'bugfix/muted-user-notif-streaming' into 'develop'
...
Bugfix: muted/blocked user notification streaming
Closes #1105
See merge request pleroma/pleroma!1461
5 years ago
Sadposter
f712ee879a
Bugfix: muted/blocked user notification streaming
5 years ago
kaniini
24362cbb3c
Merge branch 'tests/improve-test-coverage' into 'develop'
...
Add tests for users tasks and PleromaAuthenticator
See merge request pleroma/pleroma!1462
5 years ago
Sergey Suprunenko
05b5af8075
Add tests for users tasks and PleromaAuthenticator
5 years ago
kaniini
b391211aa3
Merge branch 'hide-blocked-from-interaction' into 'develop'
...
Hide blocked users from interactions
See merge request pleroma/pleroma!1463
5 years ago
Sadposter
a5d6287ba8
Hide blocked users from interactions
5 years ago
Ariadne Conill
56019d53a8
activitypub: publisher: align sharedinbox usage with AP specification rules
...
While debugging the follow breakage, I observed that our sharedInbox usage
did not match the rules in the specification. Accordingly, I have better
aligned our usage of sharedInbox with the rules outlined in the ActivityPub
specification.
5 years ago
kaniini
a00aab3402
Merge branch 'fix/rich-media-ttl-fallback' into 'develop'
...
Fix rich media parser failing when no TTL can be found by image TTL setters
See merge request pleroma/pleroma!1460
5 years ago
rinpatch
3368174785
Fix rich media parser failing when no TTL can be found by image TTL
...
setters
5 years ago
kaniini
1689a11a80
Merge branch 'bugfix/sharedinbox-path-first' into 'develop'
...
router: ensure the AP sharedinbox path is registered first
See merge request pleroma/pleroma!1458
5 years ago
Ariadne Conill
bc6c5c513a
router: ensure the AP sharedinbox path is registered first
5 years ago
Roman Chvanikov
afc7708dbe
Fix pleroma_job_queue version
5 years ago
rinpatch
196cad46f3
Resolve merge conflicts
5 years ago
rinpatch
c3ecaea64d
Apply suggestion to lib/pleroma/object/fetcher.ex
5 years ago
rinpatch
d4ee76ab63
Apply suggestion to lib/pleroma/user.ex
5 years ago
Roman Chvanikov
8292331b35
Merge branch 'develop' into feature/digest-email
5 years ago
kaniini
fe548f322e
Merge branch '1112-user-insert-conflict-id-preservation' into 'develop'
...
[#1112 ] Preserving `id` on user insert conflict
Closes #1112
See merge request pleroma/pleroma!1456
5 years ago
kaniini
6e99e7c774
Merge branch 'tests/mock-sha512-crypt' into 'develop'
...
[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest
Closes #1114
See merge request pleroma/pleroma!1455
5 years ago
Sergey Suprunenko
43a7cd27fe
[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest
5 years ago
Ivan Tashkinov
d0198fe215
[ #1112 ] Preserving `id` on user insert conflict on order not to violate conversation_partipations_user_id_fkey constraint.
5 years ago
Roman Chvanikov
ae4fc58589
Remove flavour from userinfo
5 years ago
Roman Chvanikov
36049f08ef
Merge develop
5 years ago
feld
93df0796f0
Merge branch 'feature/matstodon-statuses-by-name' into 'develop'
...
Feature/matstodon statuses by name
See merge request pleroma/pleroma!1211
5 years ago
Mark Felder
9169f331b6
Merge branch 'develop' into feature/matstodon-statuses-by-name
5 years ago
kaniini
33729bbb28
Merge branch 'feature/richmedia-ttl' into 'develop'
...
add the rich media ttl based on image exp time
See merge request pleroma/pleroma!1438
5 years ago
kaniini
c1c64d6d06
Merge branch 'feature/mix-unsubscribe-all-from-instance' into 'develop'
...
mix: add pleroma.user unsubscribe_all_from_instance
See merge request pleroma/pleroma!1454
5 years ago
Ariadne Conill
9a8eb2c94d
mix: add pleroma.user unsubscribe_all_from_instance
5 years ago
kaniini
716afc83ce
Merge branch 'refactor/http-signature-plug' into 'develop'
...
http signature plug: separation of concerns
See merge request pleroma/pleroma!1449
5 years ago
kaniini
6561709742
Merge branch 'issue/1110' into 'develop'
...
#1110 fixed /api/pleroma/healthcheck
Closes #1110
See merge request pleroma/pleroma!1453
5 years ago
Maksim
c2e2aadc42
#1110 fixed /api/pleroma/healthcheck
5 years ago
rinpatch
505613f6a7
Merge branch 'patch-2' into 'develop'
...
Update clients.md for Fedilab
See merge request pleroma/pleroma!1452
5 years ago
tom79
5c4a555b1d
Fix domain for the contact clients.md
5 years ago
tom79
b0b9eca37d
Update clients.md for Fedilab
...
- Change owner (@fedilab@framapiaf.org), Source code: Framagit, Add some other supported features
5 years ago
Sachin Joshi
581756ccc5
update the docs
5 years ago
Sachin Joshi
de9906ad56
change the structure of image ttl parsar
5 years ago
Maxim Filippov
9570a5be40
Merge branch 'develop' into feature/admin-api-user-statuses
5 years ago
Ariadne Conill
c947cfec5a
mapped signature plug: use `user` assign like authentication plug
5 years ago
kaniini
16cfee708e
Merge branch 'tests/authentication_plug' into 'develop'
...
tests for Plugs.AuthenticationPlug
See merge request pleroma/pleroma!1450
5 years ago
Maksim
f435217e50
tests for Plugs.AuthenticationPlug
5 years ago
Ariadne Conill
621cacf667
tests: add tests for mapped signature plug
5 years ago
Ariadne Conill
a8af0ac053
mapped signature plug: fix user lookup
5 years ago
Ariadne Conill
5ea0cd69f7
mapped signature plug: don't invalidate in cases where a signature is actually not present (testsuite)
5 years ago
Ariadne Conill
cdf0038d0f
mix: update http signatures dependency
5 years ago
Ariadne Conill
184fa61fb3
plugs: add MappedSignatureToIdentityPlug
5 years ago
Ariadne Conill
18d8d12d53
signature: make key_id_to_actor_id() public
5 years ago
Ariadne Conill
88d064d80e
http signature plug: remove redundant checks handled by HTTPSignatures library
...
the redundant checks assumed a POST request, which will not work for signed GETs.
this check was originally needed because the HTTPSignatures adapter assumed that
the requests were also POST requests. but now, the adapter has been corrected.
5 years ago
kaniini
f9a0014681
Merge branch 'feature/signed-object-fetches' into 'develop'
...
signed object fetches
See merge request pleroma/pleroma!1446
5 years ago
kaniini
1485d75f3c
Merge branch 'tests/uploads' into 'develop'
...
tests for Uploader with webhook
See merge request pleroma/pleroma!1447
5 years ago
Maksim
b6b748d3e7
tests for Uploader with webhook
5 years ago