kaniini
|
19835be067
|
Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'
Fix remote follow from /ostatus_subscribe
Closes #1103
See merge request pleroma/pleroma!1472
|
2019-07-24 19:29:01 +00:00 |
|
kaniini
|
931c4974ee
|
Merge branch 'fix/put-correct-activity-url' into 'develop'
Show the url advertised in the Activity in the Status JSON response
Closes #1077
See merge request pleroma/pleroma!1485
|
2019-07-24 19:28:21 +00:00 |
|
Sergey Suprunenko
|
b20020da16
|
Show the url advertised in the Activity in the Status JSON response
|
2019-07-24 19:28:21 +00:00 |
|
kPherox
|
8d9f43e1d1
|
Add WebFinger test for AP-only account
|
2019-07-25 01:27:34 +09:00 |
|
kaniini
|
acd20914ec
|
Merge branch 'fix/Upload_base_url' into 'develop'
Fix/upload base url
See merge request pleroma/pleroma!1484
|
2019-07-24 15:35:25 +00:00 |
|
|
|
84fca14c3c
|
Do not prepend /media/ when using base_url
This ensures admin has full control over the path where media resides.
|
2019-07-24 15:35:25 +00:00 |
|
kPherox
|
ac27b94ffa
|
Change to not require magic-public-key on WebFinger
|
2019-07-25 00:21:32 +09:00 |
|
kaniini
|
7286cdff7a
|
Merge branch 'tests/web_finger' into 'develop'
tests WebFinger
See merge request pleroma/pleroma!1483
|
2019-07-24 15:13:11 +00:00 |
|
Maksim
|
55341ac717
|
tests WebFinger
|
2019-07-24 15:13:10 +00:00 |
|
kaniini
|
b7fae304d3
|
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
|
2019-07-24 15:12:27 +00:00 |
|
Eugenij
|
4504135894
|
Add domain_blocking to the relationship API (GET /api/v1/accounts/relationships)
|
2019-07-24 15:12:27 +00:00 |
|
Roman Chvanikov
|
d2da3d30f3
|
Merge branch 'develop' into feature/digest-email
|
2019-07-24 16:37:52 +03:00 |
|
lain
|
53fad36b57
|
Merge branch 'develop' into 'develop'
Honour domain blocks on streamed notifications/statuses
See merge request pleroma/pleroma!1482
|
2019-07-24 11:28:05 +00:00 |
|
sadposter
|
f5d574f4ed
|
check both item and parent domain blocks
|
2019-07-24 11:35:16 +01:00 |
|
Sadposter
|
48bd3be9cb
|
move domain block check to with block
|
2019-07-24 11:11:33 +01:00 |
|
Sadposter
|
4af4f6166b
|
honour domain blocks on streaming notifications
|
2019-07-24 11:09:06 +01:00 |
|
kaniini
|
0be548b90a
|
Merge branch 'Fix-static-dir-doc' into 'develop'
Fix static_dir docs
See merge request pleroma/pleroma!1465
|
2019-07-24 01:59:41 +00:00 |
|
aries
|
9638da43e9
|
Add text about gitignore
|
2019-07-24 01:50:56 +00:00 |
|
kaniini
|
9c6357324e
|
Merge branch 'feature/admin-api-user-statuses' into 'develop'
Admin API: Endpoint for fetching latest user's statuses
See merge request pleroma/pleroma!1413
|
2019-07-23 23:59:21 +00:00 |
|
kaniini
|
2ae510ee81
|
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
|
2019-07-23 23:59:06 +00:00 |
|
Ariadne Conill
|
d3bdb8e704
|
rich media: parser: splice the given URL into the result
|
2019-07-23 23:51:29 +00:00 |
|
Maxim Filippov
|
f46805bb40
|
Merge branch 'develop' into feature/admin-api-user-statuses
|
2019-07-24 02:42:28 +03:00 |
|
Maxim Filippov
|
03471151d6
|
AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)
|
2019-07-24 01:51:36 +03:00 |
|
kaniini
|
1a751529fb
|
Merge branch 'chore/update-mix-lock' into 'develop'
update mix.lock
See merge request pleroma/pleroma!1478
|
2019-07-23 19:59:15 +00:00 |
|
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 |
|
