summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-07-24Show the url advertised in the Activity in the Status JSON responseSergey Suprunenko
2019-07-24Merge branch 'fix/Upload_base_url' into 'develop'kaniini
Fix/upload base url See merge request pleroma/pleroma!1484
2019-07-24Do not prepend /media/ when using base_urlfeld
This ensures admin has full control over the path where media resides.
2019-07-24Merge branch 'tests/web_finger' into 'develop'kaniini
tests WebFinger See merge request pleroma/pleroma!1483
2019-07-24tests WebFingerMaksim
2019-07-24Merge branch 'domain-blocking-relationship-api' into 'develop'kaniini
Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships) See merge request pleroma/pleroma!1481
2019-07-24Add `domain_blocking` to the relationship API (GET ↵Eugenij
/api/v1/accounts/relationships)
2019-07-24Merge branch 'develop' into 'develop'lain
Honour domain blocks on streamed notifications/statuses See merge request pleroma/pleroma!1482
2019-07-24check both item and parent domain blockssadposter
2019-07-24move domain block check to with blockSadposter
2019-07-24honour domain blocks on streaming notificationsSadposter
2019-07-24Merge branch 'Fix-static-dir-doc' into 'develop'kaniini
Fix static_dir docs See merge request pleroma/pleroma!1465
2019-07-24Add text about gitignorearies
2019-07-23Merge branch 'feature/admin-api-user-statuses' into 'develop'kaniini
Admin API: Endpoint for fetching latest user's statuses See merge request pleroma/pleroma!1413
2019-07-23Merge branch 'bugfix/rich-media-splice-url' into 'develop'kaniini
rich media: parser: splice the given URL into the result See merge request pleroma/pleroma!1480
2019-07-23rich media: parser: splice the given URL into the resultAriadne Conill
2019-07-24Merge branch 'develop' into feature/admin-api-user-statusesMaxim Filippov
2019-07-24AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see ↵Maxim Filippov
private statuses)
2019-07-23Merge branch 'chore/update-mix-lock' into 'develop'kaniini
update mix.lock See merge request pleroma/pleroma!1478
2019-07-23update mix.lockAriadne Conill
2019-07-23Merge branch 'chore/adminapi-deprecated-endpoints' into 'develop'kaniini
Router: Remove deprecated AdminAPI endpoints See merge request pleroma/pleroma!1466
2019-07-23Router: Remove deprecated AdminAPI endpointsHaelwenn (lanodan) Monnier
2019-07-23Merge branch 'admin-config-fix' into 'develop'kaniini
Admin config fix See merge request pleroma/pleroma!1471
2019-07-23Admin config fixAlexander Strizhakov
2019-07-23Merge branch 'tests/activity_pub_publisher' into 'develop'kaniini
tests for Pleroma.Web.ActivityPub.Publisher See merge request pleroma/pleroma!1473
2019-07-23tests for Pleroma.Web.ActivityPub.PublisherMaksim
2019-07-23Merge branch 'bugfix/unauthed-liked-by' into 'develop'kaniini
Bugfix: don't error out on unauthorized request to liked/favourited_by See merge request pleroma/pleroma!1474
2019-07-23Merge branch 'patch-2' into 'develop'kaniini
Update `prometheus_phoenix` to v1.3 in order to support `phoenix@1.4`. Closes #1050 See merge request pleroma/pleroma!1475
2019-07-23Merge branch 'fix/subscriber-notifications' into 'develop'kaniini
Do not notify subscribers for messages from users which are replies to others See merge request pleroma/pleroma!1477
2019-07-23Fix testMark Felder
2019-07-23Fix functionMark Felder
2019-07-23move unauth'd user blocks?/2 checkSadposter
2019-07-23Merge branch 'bugfix/http-signatures-misskey' into 'develop'Haelwenn
signature: properly deduce the actor from misskey key IDs See merge request pleroma/pleroma!1476
2019-07-23Do not notify subscribers for messages from users which are replies to othersMark Felder
2019-07-23signature: properly deduce the actor from misskey key IDsAriadne Conill
2019-07-23Update `prometheus_phoenix` to v1.3 in order to support `phoenix@1.4`.oncletom
2019-07-23fix test names because i cannot typeSadposter
2019-07-23actually reblog on the reblog testSadposter
2019-07-23Use correct URL for testsSadposter
2019-07-23Mix formatSadposter
2019-07-23add tests for unauthed reqs to liked/reblogged_bySadposter
2019-07-23fix unauthenticated req to favourited/rebloggd_bySadposter
2019-07-23remove pryMaxim Filippov
2019-07-23Fix the sentence and add the setting exampleAries
2019-07-22Merge branch 'tests/skip-some-tests-on-mac' into 'develop'kaniini
Exclude tests that use :crypt.crypt/2 on macOS See merge request pleroma/pleroma!1470
2019-07-22Exclude tests that use :crypt.crypt/2 on macOSSergey Suprunenko
2019-07-22Merge branch 'changelog' into 'develop'kaniini
changelog See merge request pleroma/pleroma!1469
2019-07-22changelogAlexander Strizhakov
2019-07-22Merge branch 'feature/1087-wildcard-option-for-blocks' into 'develop'kaniini
Feature/1087 wildcard option for blocks Closes #1087 See merge request pleroma/pleroma!1467
2019-07-22Feature/1087 wildcard option for blocksAlexander Strizhakov