alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,680 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

6680 Commits

Author SHA1 Message Date
Ariadne Conill 0afaf96640 update mix.lock 2019-07-23 19:49:36 +00:00
kaniini bd265acf91 Merge branch 'chore/adminapi-deprecated-endpoints' into 'develop' 
Router: Remove deprecated AdminAPI endpoints

See merge request pleroma/pleroma!1466
 2019-07-23 19:48:34 +00:00
Haelwenn (lanodan) Monnier 90be91b0e0
Router: Remove deprecated AdminAPI endpoints 2019-07-23 21:35:25 +02:00
kaniini 5230b9ef3d Merge branch 'admin-config-fix' into 'develop' 
Admin config fix

See merge request pleroma/pleroma!1471
 2019-07-23 19:17:00 +00:00
Alexander Strizhakov 5e72554f3c Admin config fix 2019-07-23 19:17:00 +00:00
kaniini dd96be5c8b Merge branch 'tests/activity_pub_publisher' into 'develop' 
tests for Pleroma.Web.ActivityPub.Publisher

See merge request pleroma/pleroma!1473
 2019-07-23 19:15:48 +00:00
Maksim c49a09ed88 tests for Pleroma.Web.ActivityPub.Publisher 2019-07-23 19:15:48 +00:00
kaniini 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
 2019-07-23 19:14:43 +00:00
kaniini 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
 2019-07-23 19:14:16 +00:00
kaniini 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
 2019-07-23 19:13:55 +00:00
Mark Felder ec7b085b76 Fix test 2019-07-23 13:57:22 -05:00
Mark Felder 6a79bb12c3 Fix function 2019-07-23 13:53:05 -05:00
Sadposter 54a161cb7a move unauth'd user blocks?/2 check 2019-07-23 19:44:47 +01:00
Haelwenn 638f772356 Merge branch 'bugfix/http-signatures-misskey' into 'develop' 
signature: properly deduce the actor from misskey key IDs

See merge request pleroma/pleroma!1476
 2019-07-23 18:39:01 +00:00
Mark Felder fd287387a0 Do not notify subscribers for messages from users which are replies to others 2019-07-23 13:14:26 -05:00
Ariadne Conill e7c64f106e signature: properly deduce the actor from misskey key IDs 2019-07-23 16:47:22 +00:00
oncletom 2e697f87f4 Update `prometheus_phoenix` to v1.3 in order to support `phoenix@1.4`. 2019-07-23 15:16:47 +00:00
Sadposter c400565427 fix test names because i cannot type 2019-07-23 15:47:17 +01:00
Sadposter 299c0e965b actually reblog on the reblog test 2019-07-23 15:38:19 +01:00
Sadposter 7026018c8c Use correct URL for tests 2019-07-23 15:31:35 +01:00
Sadposter 452980652d Mix format 2019-07-23 15:13:05 +01:00
Sadposter fd1fa5a2ec add tests for unauthed reqs to liked/reblogged_by 2019-07-23 15:08:41 +01:00
Sadposter eacf61d823 fix unauthenticated req to favourited/rebloggd_by 2019-07-23 15:08:33 +01:00
kPherox e818381042
Use User.get_or_fetch/1 instead of OStatus.find_or_make_user/1 2019-07-23 19:47:27 +09:00
Maxim Filippov 14ab2fd0f4 remove pry 2019-07-23 12:30:37 +03:00
Aries 1e7d68e8bf Fix the sentence and add the setting example 2019-07-23 09:55:58 +09:00
kaniini 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
 2019-07-22 19:54:22 +00:00
Sergey Suprunenko 9340896c9e Exclude tests that use :crypt.crypt/2 on macOS 2019-07-22 19:54:22 +00:00
kaniini 2951714429 Merge branch 'changelog' into 'develop' 
changelog

See merge request pleroma/pleroma!1469
 2019-07-22 19:53:53 +00:00
Alexander Strizhakov 2442b5c18e changelog 2019-07-22 19:53:53 +00:00
kaniini 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
 2019-07-22 14:33:58 +00:00
Alexander Strizhakov b70e659304 Feature/1087 wildcard option for blocks 2019-07-22 14:33:58 +00:00
Haelwenn 674ad5e1df Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop' 
activitypub: publisher: align sharedinbox usage with AP specification rules

See merge request pleroma/pleroma!1464
 2019-07-22 11:01:35 +00:00
aries 63924ee712 Fix static_dir docs 2019-07-22 18:46:32 +09:00
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
 2019-07-22 02:43:55 +00:00
Sadposter f712ee879a Bugfix: muted/blocked user notification streaming 2019-07-22 02:43:55 +00:00
kaniini 24362cbb3c Merge branch 'tests/improve-test-coverage' into 'develop' 
Add tests for users tasks and PleromaAuthenticator

See merge request pleroma/pleroma!1462
 2019-07-22 02:43:15 +00:00
Sergey Suprunenko 05b5af8075 Add tests for users tasks and PleromaAuthenticator 2019-07-22 02:43:15 +00:00
kaniini b391211aa3 Merge branch 'hide-blocked-from-interaction' into 'develop' 
Hide blocked users from interactions

See merge request pleroma/pleroma!1463
 2019-07-22 02:42:29 +00:00
Sadposter a5d6287ba8 Hide blocked users from interactions 2019-07-22 02:42:29 +00:00
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.
 2019-07-22 02:38:31 +00:00
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
 2019-07-21 16:05:58 +00:00
rinpatch 3368174785 Fix rich media parser failing when no TTL can be found by image TTL 
setters
 2019-07-21 18:22:22 +03:00
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
 2019-07-21 04:18:12 +00:00
Ariadne Conill bc6c5c513a router: ensure the AP sharedinbox path is registered first 2019-07-21 03:52:06 +00:00
Roman Chvanikov afc7708dbe Fix pleroma_job_queue version 2019-07-21 00:01:58 +03:00
rinpatch 196cad46f3 Resolve merge conflicts 2019-07-20 22:04:47 +03:00
rinpatch c3ecaea64d Apply suggestion to lib/pleroma/object/fetcher.ex 2019-07-20 18:53:00 +00:00
rinpatch d4ee76ab63 Apply suggestion to lib/pleroma/user.ex 2019-07-20 18:52:41 +00:00
Roman Chvanikov 8292331b35 Merge branch 'develop' into feature/digest-email 2019-07-20 16:41:58 +03:00