feld [Wed, 24 Jul 2019 15:35:25 +0000 (15:35 +0000)]
Do not prepend /media/ when using base_url
This ensures admin has full control over the path where media resides.
kaniini [Wed, 24 Jul 2019 15:13:11 +0000 (15:13 +0000)]
Merge branch 'tests/web_finger' into 'develop'
tests WebFinger
See merge request pleroma/pleroma!1483
Maksim [Wed, 24 Jul 2019 15:13:10 +0000 (15:13 +0000)]
tests WebFinger
kaniini [Wed, 24 Jul 2019 15:12:27 +0000 (15:12 +0000)]
Merge branch 'domain-blocking-relationship-api' into 'develop'
Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)
See merge request pleroma/pleroma!1481
Eugenij [Wed, 24 Jul 2019 15:12:27 +0000 (15:12 +0000)]
Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)
lain [Wed, 24 Jul 2019 11:28:05 +0000 (11:28 +0000)]
Merge branch 'develop' into 'develop'
Honour domain blocks on streamed notifications/statuses
See merge request pleroma/pleroma!1482
sadposter [Wed, 24 Jul 2019 10:35:16 +0000 (11:35 +0100)]
check both item and parent domain blocks
Sadposter [Wed, 24 Jul 2019 10:11:33 +0000 (11:11 +0100)]
move domain block check to with block
Sadposter [Wed, 24 Jul 2019 10:09:06 +0000 (11:09 +0100)]
honour domain blocks on streaming notifications
kaniini [Wed, 24 Jul 2019 01:59:41 +0000 (01:59 +0000)]
Merge branch 'Fix-static-dir-doc' into 'develop'
Fix static_dir docs
See merge request pleroma/pleroma!1465
aries [Wed, 24 Jul 2019 01:50:56 +0000 (01:50 +0000)]
Add text about gitignore
kaniini [Tue, 23 Jul 2019 23:59:21 +0000 (23:59 +0000)]
Merge branch 'feature/admin-api-user-statuses' into 'develop'
Admin API: Endpoint for fetching latest user's statuses
See merge request pleroma/pleroma!1413
kaniini [Tue, 23 Jul 2019 23:59:06 +0000 (23:59 +0000)]
Merge branch 'bugfix/rich-media-splice-url' into 'develop'
rich media: parser: splice the given URL into the result
See merge request pleroma/pleroma!1480
Ariadne Conill [Tue, 23 Jul 2019 22:58:31 +0000 (22:58 +0000)]
rich media: parser: splice the given URL into the result
Maxim Filippov [Tue, 23 Jul 2019 23:42:28 +0000 (02:42 +0300)]
Merge branch 'develop' into feature/admin-api-user-statuses
Maxim Filippov [Tue, 23 Jul 2019 22:50:09 +0000 (01:50 +0300)]
AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)
kaniini [Tue, 23 Jul 2019 19:59:15 +0000 (19:59 +0000)]
Merge branch 'chore/update-mix-lock' into 'develop'
update mix.lock
See merge request pleroma/pleroma!1478
Ariadne Conill [Tue, 23 Jul 2019 19:49:36 +0000 (19:49 +0000)]
update mix.lock
kaniini [Tue, 23 Jul 2019 19:48:34 +0000 (19:48 +0000)]
Merge branch 'chore/adminapi-deprecated-endpoints' into 'develop'
Router: Remove deprecated AdminAPI endpoints
See merge request pleroma/pleroma!1466
Haelwenn (lanodan) Monnier [Mon, 22 Jul 2019 11:41:56 +0000 (13:41 +0200)]
Router: Remove deprecated AdminAPI endpoints
kaniini [Tue, 23 Jul 2019 19:17:00 +0000 (19:17 +0000)]
Merge branch 'admin-config-fix' into 'develop'
Admin config fix
See merge request pleroma/pleroma!1471
Alexander Strizhakov [Tue, 23 Jul 2019 19:17:00 +0000 (19:17 +0000)]
Admin config fix
kaniini [Tue, 23 Jul 2019 19:15:48 +0000 (19:15 +0000)]
Merge branch 'tests/activity_pub_publisher' into 'develop'
tests for Pleroma.Web.ActivityPub.Publisher
See merge request pleroma/pleroma!1473
Maksim [Tue, 23 Jul 2019 19:15:48 +0000 (19:15 +0000)]
tests for Pleroma.Web.ActivityPub.Publisher
kaniini [Tue, 23 Jul 2019 19:14:43 +0000 (19:14 +0000)]
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
kaniini [Tue, 23 Jul 2019 19:14:16 +0000 (19:14 +0000)]
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
kaniini [Tue, 23 Jul 2019 19:13:55 +0000 (19:13 +0000)]
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
Mark Felder [Tue, 23 Jul 2019 18:57:22 +0000 (13:57 -0500)]
Fix test
Mark Felder [Tue, 23 Jul 2019 18:53:05 +0000 (13:53 -0500)]
Fix function
Sadposter [Tue, 23 Jul 2019 18:44:47 +0000 (19:44 +0100)]
move unauth'd user blocks?/2 check
Haelwenn [Tue, 23 Jul 2019 18:39:01 +0000 (18:39 +0000)]
Merge branch 'bugfix/http-signatures-misskey' into 'develop'
signature: properly deduce the actor from misskey key IDs
See merge request pleroma/pleroma!1476
Mark Felder [Tue, 23 Jul 2019 18:14:26 +0000 (13:14 -0500)]
Do not notify subscribers for messages from users which are replies to others
Ariadne Conill [Tue, 23 Jul 2019 16:47:22 +0000 (16:47 +0000)]
signature: properly deduce the actor from misskey key IDs
oncletom [Tue, 23 Jul 2019 15:16:47 +0000 (15:16 +0000)]
Update `prometheus_phoenix` to v1.3 in order to support `phoenix@1.4`.
Sadposter [Tue, 23 Jul 2019 14:47:17 +0000 (15:47 +0100)]
fix test names because i cannot type
Sadposter [Tue, 23 Jul 2019 14:38:19 +0000 (15:38 +0100)]
actually reblog on the reblog test
Sadposter [Tue, 23 Jul 2019 14:31:35 +0000 (15:31 +0100)]
Use correct URL for tests
Sadposter [Tue, 23 Jul 2019 14:13:05 +0000 (15:13 +0100)]
Mix format
Sadposter [Tue, 23 Jul 2019 14:05:19 +0000 (15:05 +0100)]
add tests for unauthed reqs to liked/reblogged_by
Sadposter [Tue, 23 Jul 2019 14:02:18 +0000 (15:02 +0100)]
fix unauthenticated req to favourited/rebloggd_by
Maxim Filippov [Tue, 23 Jul 2019 09:30:37 +0000 (12:30 +0300)]
remove pry
Aries [Tue, 23 Jul 2019 00:55:58 +0000 (09:55 +0900)]
Fix the sentence and add the setting example
kaniini [Mon, 22 Jul 2019 19:54:22 +0000 (19:54 +0000)]
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
Sergey Suprunenko [Mon, 22 Jul 2019 19:54:22 +0000 (19:54 +0000)]
Exclude tests that use :crypt.crypt/2 on macOS
kaniini [Mon, 22 Jul 2019 19:53:53 +0000 (19:53 +0000)]
Merge branch 'changelog' into 'develop'
changelog
See merge request pleroma/pleroma!1469
Alexander Strizhakov [Mon, 22 Jul 2019 19:53:53 +0000 (19:53 +0000)]
changelog
kaniini [Mon, 22 Jul 2019 14:33:58 +0000 (14:33 +0000)]
Merge branch 'feature/1087-wildcard-option-for-blocks' into 'develop'
Feature/1087 wildcard option for blocks
Closes #1087
See merge request pleroma/pleroma!1467
Alexander Strizhakov [Mon, 22 Jul 2019 14:33:58 +0000 (14:33 +0000)]
Feature/1087 wildcard option for blocks
Haelwenn [Mon, 22 Jul 2019 11:01:35 +0000 (11:01 +0000)]
Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop'
activitypub: publisher: align sharedinbox usage with AP specification rules
See merge request pleroma/pleroma!1464
aries [Mon, 22 Jul 2019 09:46:32 +0000 (18:46 +0900)]
Fix static_dir docs
kaniini [Mon, 22 Jul 2019 02:43:55 +0000 (02:43 +0000)]
Merge branch 'bugfix/muted-user-notif-streaming' into 'develop'
Bugfix: muted/blocked user notification streaming
Closes #1105
See merge request pleroma/pleroma!1461
Sadposter [Mon, 22 Jul 2019 02:43:55 +0000 (02:43 +0000)]
Bugfix: muted/blocked user notification streaming
kaniini [Mon, 22 Jul 2019 02:43:15 +0000 (02:43 +0000)]
Merge branch 'tests/improve-test-coverage' into 'develop'
Add tests for users tasks and PleromaAuthenticator
See merge request pleroma/pleroma!1462
Sergey Suprunenko [Mon, 22 Jul 2019 02:43:15 +0000 (02:43 +0000)]
Add tests for users tasks and PleromaAuthenticator
kaniini [Mon, 22 Jul 2019 02:42:29 +0000 (02:42 +0000)]
Merge branch 'hide-blocked-from-interaction' into 'develop'
Hide blocked users from interactions
See merge request pleroma/pleroma!1463
Sadposter [Mon, 22 Jul 2019 02:42:29 +0000 (02:42 +0000)]
Hide blocked users from interactions
Ariadne Conill [Mon, 22 Jul 2019 02:18:45 +0000 (02:18 +0000)]
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.
kaniini [Sun, 21 Jul 2019 16:05:58 +0000 (16:05 +0000)]
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
rinpatch [Sun, 21 Jul 2019 15:22:22 +0000 (18:22 +0300)]
Fix rich media parser failing when no TTL can be found by image TTL
setters
kaniini [Sun, 21 Jul 2019 04:18:12 +0000 (04:18 +0000)]
Merge branch 'bugfix/sharedinbox-path-first' into 'develop'
router: ensure the AP sharedinbox path is registered first
See merge request pleroma/pleroma!1458
Ariadne Conill [Sun, 21 Jul 2019 03:52:06 +0000 (03:52 +0000)]
router: ensure the AP sharedinbox path is registered first
kaniini [Sat, 20 Jul 2019 13:09:38 +0000 (13:09 +0000)]
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
kaniini [Sat, 20 Jul 2019 13:07:51 +0000 (13:07 +0000)]
Merge branch 'tests/mock-sha512-crypt' into 'develop'
[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest
Closes #1114
See merge request pleroma/pleroma!1455
Sergey Suprunenko [Sat, 20 Jul 2019 13:07:51 +0000 (13:07 +0000)]
[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest
Ivan Tashkinov [Sat, 20 Jul 2019 10:03:34 +0000 (13:03 +0300)]
[#1112] Preserving `id` on user insert conflict on order not to violate conversation_partipations_user_id_fkey constraint.
feld [Fri, 19 Jul 2019 21:59:18 +0000 (21:59 +0000)]
Merge branch 'feature/matstodon-statuses-by-name' into 'develop'
Feature/matstodon statuses by name
See merge request pleroma/pleroma!1211
Mark Felder [Fri, 19 Jul 2019 21:55:10 +0000 (16:55 -0500)]
Merge branch 'develop' into feature/matstodon-statuses-by-name
kaniini [Fri, 19 Jul 2019 21:36:36 +0000 (21:36 +0000)]
Merge branch 'feature/richmedia-ttl' into 'develop'
add the rich media ttl based on image exp time
See merge request pleroma/pleroma!1438
kaniini [Fri, 19 Jul 2019 19:33:47 +0000 (19:33 +0000)]
Merge branch 'feature/mix-unsubscribe-all-from-instance' into 'develop'
mix: add pleroma.user unsubscribe_all_from_instance
See merge request pleroma/pleroma!1454
Ariadne Conill [Fri, 19 Jul 2019 19:11:04 +0000 (19:11 +0000)]
mix: add pleroma.user unsubscribe_all_from_instance
kaniini [Fri, 19 Jul 2019 16:57:24 +0000 (16:57 +0000)]
Merge branch 'refactor/http-signature-plug' into 'develop'
http signature plug: separation of concerns
See merge request pleroma/pleroma!1449
kaniini [Fri, 19 Jul 2019 16:20:23 +0000 (16:20 +0000)]
Merge branch 'issue/1110' into 'develop'
#1110 fixed /api/pleroma/healthcheck
Closes #1110
See merge request pleroma/pleroma!1453
Maksim [Fri, 19 Jul 2019 16:20:23 +0000 (16:20 +0000)]
#1110 fixed /api/pleroma/healthcheck
rinpatch [Fri, 19 Jul 2019 10:15:16 +0000 (10:15 +0000)]
Merge branch 'patch-2' into 'develop'
Update clients.md for Fedilab
See merge request pleroma/pleroma!1452
tom79 [Fri, 19 Jul 2019 08:40:47 +0000 (08:40 +0000)]
Fix domain for the contact clients.md
tom79 [Fri, 19 Jul 2019 08:39:22 +0000 (08:39 +0000)]
Update clients.md for Fedilab
- Change owner (@fedilab@framapiaf.org), Source code: Framagit, Add some other supported features
Sachin Joshi [Fri, 19 Jul 2019 06:05:47 +0000 (11:50 +0545)]
update the docs
Sachin Joshi [Fri, 19 Jul 2019 05:58:42 +0000 (11:43 +0545)]
change the structure of image ttl parsar
Maxim Filippov [Thu, 18 Jul 2019 20:38:38 +0000 (23:38 +0300)]
Merge branch 'develop' into feature/admin-api-user-statuses
Ariadne Conill [Thu, 18 Jul 2019 20:31:25 +0000 (20:31 +0000)]
mapped signature plug: use `user` assign like authentication plug
kaniini [Thu, 18 Jul 2019 20:29:51 +0000 (20:29 +0000)]
Merge branch 'tests/authentication_plug' into 'develop'
tests for Plugs.AuthenticationPlug
See merge request pleroma/pleroma!1450
Maksim [Thu, 18 Jul 2019 20:29:51 +0000 (20:29 +0000)]
tests for Plugs.AuthenticationPlug
Ariadne Conill [Thu, 18 Jul 2019 16:28:36 +0000 (16:28 +0000)]
tests: add tests for mapped signature plug
Ariadne Conill [Thu, 18 Jul 2019 16:27:50 +0000 (16:27 +0000)]
mapped signature plug: fix user lookup
Ariadne Conill [Thu, 18 Jul 2019 16:01:21 +0000 (16:01 +0000)]
mapped signature plug: don't invalidate in cases where a signature is actually not present (testsuite)
Ariadne Conill [Thu, 18 Jul 2019 15:51:58 +0000 (15:51 +0000)]
mix: update http signatures dependency
Ariadne Conill [Thu, 18 Jul 2019 15:38:45 +0000 (15:38 +0000)]
plugs: add MappedSignatureToIdentityPlug
Ariadne Conill [Thu, 18 Jul 2019 15:35:42 +0000 (15:35 +0000)]
signature: make key_id_to_actor_id() public
Ariadne Conill [Thu, 18 Jul 2019 15:06:58 +0000 (15:06 +0000)]
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.
kaniini [Thu, 18 Jul 2019 13:27:50 +0000 (13:27 +0000)]
Merge branch 'feature/signed-object-fetches' into 'develop'
signed object fetches
See merge request pleroma/pleroma!1446
kaniini [Thu, 18 Jul 2019 12:30:18 +0000 (12:30 +0000)]
Merge branch 'tests/uploads' into 'develop'
tests for Uploader with webhook
See merge request pleroma/pleroma!1447
Maksim [Thu, 18 Jul 2019 12:30:18 +0000 (12:30 +0000)]
tests for Uploader with webhook
kaniini [Thu, 18 Jul 2019 12:29:26 +0000 (12:29 +0000)]
Merge branch 'fix-howto_mediaproxy' into 'develop'
Fix media proxy doc redirect setting not working
See merge request pleroma/pleroma!1448
aries [Thu, 18 Jul 2019 12:08:31 +0000 (21:08 +0900)]
Fix redirect setting not working
Ariadne Conill [Wed, 17 Jul 2019 23:07:53 +0000 (23:07 +0000)]
update changelog
Ariadne Conill [Wed, 17 Jul 2019 22:58:52 +0000 (22:58 +0000)]
tests: add tests for signed object fetches
kaniini [Wed, 17 Jul 2019 23:03:46 +0000 (23:03 +0000)]
Merge branch 'patch-2' into 'develop'
Update clients.md - added Homepage for Fedilab Android app
See merge request pleroma/pleroma!1444
tallship [Wed, 17 Jul 2019 23:03:46 +0000 (23:03 +0000)]
Update clients.md - added Homepage for Fedilab Android app
kaniini [Wed, 17 Jul 2019 23:03:30 +0000 (23:03 +0000)]
Merge branch 'patch-3' into 'develop'
Update otp_en.md - Added creation of initial admin user
See merge request pleroma/pleroma!1445
Ariadne Conill [Wed, 17 Jul 2019 22:41:42 +0000 (22:41 +0000)]
fetcher: sign object fetches if configured
projects / akkoma / log