summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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
2019-07-22Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop'Haelwenn
activitypub: publisher: align sharedinbox usage with AP specification rules See merge request pleroma/pleroma!1464
2019-07-22Merge branch 'bugfix/muted-user-notif-streaming' into 'develop'kaniini
Bugfix: muted/blocked user notification streaming Closes #1105 See merge request pleroma/pleroma!1461
2019-07-22Bugfix: muted/blocked user notification streamingSadposter
2019-07-22Merge branch 'tests/improve-test-coverage' into 'develop'kaniini
Add tests for users tasks and PleromaAuthenticator See merge request pleroma/pleroma!1462
2019-07-22Add tests for users tasks and PleromaAuthenticatorSergey Suprunenko
2019-07-22Merge branch 'hide-blocked-from-interaction' into 'develop'kaniini
Hide blocked users from interactions See merge request pleroma/pleroma!1463
2019-07-22Hide blocked users from interactionsSadposter
2019-07-22activitypub: publisher: align sharedinbox usage with AP specification rulesAriadne Conill
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-21Merge branch 'fix/rich-media-ttl-fallback' into 'develop'kaniini
Fix rich media parser failing when no TTL can be found by image TTL setters See merge request pleroma/pleroma!1460
2019-07-21Fix rich media parser failing when no TTL can be found by image TTLrinpatch
setters
2019-07-21Merge branch 'bugfix/sharedinbox-path-first' into 'develop'kaniini
router: ensure the AP sharedinbox path is registered first See merge request pleroma/pleroma!1458
2019-07-21router: ensure the AP sharedinbox path is registered firstAriadne Conill
2019-07-20Merge branch '1112-user-insert-conflict-id-preservation' into 'develop'kaniini
[#1112] Preserving `id` on user insert conflict Closes #1112 See merge request pleroma/pleroma!1456
2019-07-20Merge branch 'tests/mock-sha512-crypt' into 'develop'kaniini
[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest Closes #1114 See merge request pleroma/pleroma!1455
2019-07-20[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTestSergey Suprunenko
2019-07-20[#1112] Preserving `id` on user insert conflict on order not to violate ↵Ivan Tashkinov
conversation_partipations_user_id_fkey constraint.
2019-07-19Merge branch 'feature/matstodon-statuses-by-name' into 'develop'feld
Feature/matstodon statuses by name See merge request pleroma/pleroma!1211
2019-07-19Merge branch 'develop' into feature/matstodon-statuses-by-nameMark Felder
2019-07-19Merge branch 'feature/richmedia-ttl' into 'develop'kaniini
add the rich media ttl based on image exp time See merge request pleroma/pleroma!1438
2019-07-19Merge branch 'feature/mix-unsubscribe-all-from-instance' into 'develop'kaniini
mix: add pleroma.user unsubscribe_all_from_instance See merge request pleroma/pleroma!1454
2019-07-19mix: add pleroma.user unsubscribe_all_from_instanceAriadne Conill
2019-07-19Merge branch 'refactor/http-signature-plug' into 'develop'kaniini
http signature plug: separation of concerns See merge request pleroma/pleroma!1449
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-12 16:45:36 +0000