5230b9ef3d
Merge branch 'admin-config-fix' into 'develop'
...
Admin config fix
See merge request pleroma/pleroma!1471
5 years ago
5e72554f3c
Admin config fix
5 years ago
dd96be5c8b
Merge branch 'tests/activity_pub_publisher' into 'develop'
...
tests for Pleroma.Web.ActivityPub.Publisher
See merge request pleroma/pleroma!1473
5 years ago
c49a09ed88
tests for Pleroma.Web.ActivityPub.Publisher
5 years ago
8d3cf7e519
Merge branch 'bugfix/unauthed-liked-by' into 'develop'
...
Bugfix: don't error out on unauthorized request to liked/favourited_by
See merge request pleroma/pleroma!1474
5 years ago
ad60837300
Merge branch 'patch-2' into 'develop'
...
Update `prometheus_phoenix` to v1.3 in order to support `phoenix@1.4`.
Closes #1050
See merge request pleroma/pleroma!1475
5 years ago
03d89e182e
Merge branch 'fix/subscriber-notifications' into 'develop'
...
Do not notify subscribers for messages from users which are replies to others
See merge request pleroma/pleroma!1477
5 years ago
ec7b085b76
Fix test
5 years ago
6a79bb12c3
Fix function
5 years ago
54a161cb7a
move unauth'd user blocks?/2 check
5 years ago
638f772356
Merge branch 'bugfix/http-signatures-misskey' into 'develop'
...
signature: properly deduce the actor from misskey key IDs
See merge request pleroma/pleroma!1476
5 years ago
fd287387a0
Do not notify subscribers for messages from users which are replies to others
5 years ago
e7c64f106e
signature: properly deduce the actor from misskey key IDs
5 years ago
2e697f87f4
Update `prometheus_phoenix` to v1.3 in order to support `phoenix@1.4`.
5 years ago
c400565427
fix test names because i cannot type
5 years ago
299c0e965b
actually reblog on the reblog test
5 years ago
7026018c8c
Use correct URL for tests
5 years ago
452980652d
Mix format
5 years ago
fd1fa5a2ec
add tests for unauthed reqs to liked/reblogged_by
5 years ago
eacf61d823
fix unauthenticated req to favourited/rebloggd_by
5 years ago
e818381042
Use User.get_or_fetch/1 instead of OStatus.find_or_make_user/1
5 years ago
14ab2fd0f4
remove pry
5 years ago
1e7d68e8bf
Fix the sentence and add the setting example
5 years ago
a042a7ac6d
Merge branch 'tests/skip-some-tests-on-mac' into 'develop'
...
Exclude tests that use :crypt.crypt/2 on macOS
See merge request pleroma/pleroma!1470
5 years ago
9340896c9e
Exclude tests that use :crypt.crypt/2 on macOS
5 years ago
2951714429
Merge branch 'changelog' into 'develop'
...
changelog
See merge request pleroma/pleroma!1469
5 years ago
2442b5c18e
changelog
5 years ago
4a8b522639
Merge branch 'feature/1087-wildcard-option-for-blocks' into 'develop'
...
Feature/1087 wildcard option for blocks
Closes #1087
See merge request pleroma/pleroma!1467
5 years ago
b70e659304
Feature/1087 wildcard option for blocks
5 years ago
674ad5e1df
Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop'
...
activitypub: publisher: align sharedinbox usage with AP specification rules
See merge request pleroma/pleroma!1464
5 years ago
63924ee712
Fix static_dir docs
5 years ago
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
f712ee879a
Bugfix: muted/blocked user notification streaming
5 years ago
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
05b5af8075
Add tests for users tasks and PleromaAuthenticator
5 years ago
b391211aa3
Merge branch 'hide-blocked-from-interaction' into 'develop'
...
Hide blocked users from interactions
See merge request pleroma/pleroma!1463
5 years ago
a5d6287ba8
Hide blocked users from interactions
5 years ago
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
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
3368174785
Fix rich media parser failing when no TTL can be found by image TTL
...
setters
5 years ago
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
bc6c5c513a
router: ensure the AP sharedinbox path is registered first
5 years ago
196cad46f3
Resolve merge conflicts
5 years ago
c3ecaea64d
Apply suggestion to lib/pleroma/object/fetcher.ex
5 years ago
d4ee76ab63
Apply suggestion to lib/pleroma/user.ex
5 years ago
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
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
43a7cd27fe
[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest
5 years ago
d0198fe215
[ #1112 ] Preserving `id` on user insert conflict on order not to violate conversation_partipations_user_id_fkey constraint.
5 years ago
93df0796f0
Merge branch 'feature/matstodon-statuses-by-name' into 'develop'
...
Feature/matstodon statuses by name
See merge request pleroma/pleroma!1211
5 years ago
kaniini