aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2020-04-16Merge branch 'fix/1691-feed-render' into 'develop'rinpatch
Fix for use of `published` field from different entities Closes #1691 See merge request pleroma/pleroma!2395
2020-04-16Merge branch 'develop' into features/remove-user-source_datarinpatch
2020-04-16fix for use of published from different entitiesAlexander Strizhakov
2020-04-16Merge branch 'refactor/remove-upgrade-changeset' into 'develop'rinpatch
Remove User.upgrade_changeset in favor of remote_user_creation See merge request pleroma/pleroma!2368
2020-04-16user: remove blank?rinpatch
2020-04-16added need_reboot endpoint to admin apiAlexander Strizhakov
2020-04-15Cleanup SubscriptionControllerEgor Kislitsyn
2020-04-15added an endpoint for getting unread notification countMaksim Pechnikov
2020-04-15[#2349] Made :skip_plug/2 prevent plug from being executed even if ↵Ivan Tashkinov
explicitly called. Refactoring. Tests.
2020-04-15Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
authenticated-api-oauth-check-enforcement
2020-04-15Merge branch 'fix/1659-rate-limiter' into 'develop'Haelwenn
remote_ip plug adds remote_ip_found flag Closes #1659 See merge request pleroma/pleroma!2390
2020-04-15Fix credo warningEgor Kislitsyn
2020-04-15Add a TODO noteEgor Kislitsyn
2020-04-15Abstract pagination params in OpenAPI specEgor Kislitsyn
2020-04-15remote_ip plug adds remote_ip_found flagAlexander Strizhakov
2020-04-15Fix formattingEgor Kislitsyn
2020-04-15Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.exminibikini
2020-04-15Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.exminibikini
2020-04-15Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.exminibikini
2020-04-15Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.exminibikini
2020-04-15Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.exminibikini
2020-04-15Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.exminibikini
2020-04-15Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.exminibikini
2020-04-15Uploads: Sandbox them in the CSP.lain
2020-04-14Merge branch 'fix/openapi-form-mimetype' into 'develop'rinpatch
openapi: add application/x-www-form-urlencoded to body types Closes #1683 See merge request pleroma/pleroma!2387
2020-04-15openapi: add application/x-www-form-urlencoded to body typesrinpatch
Closes #1683
2020-04-14[#1364] Resolved merge conflicts with `develop`.Ivan Tashkinov
2020-04-14Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1364-no-pushes-from-blocked-domains-users # Conflicts: # lib/pleroma/notification.ex
2020-04-14Fix Oban not receiving :ok from RichMediaHelper jobMark Felder
2020-04-14Revert "Merge branch 'issue/1276' into 'develop'"lain
This reverts merge request !1877
2020-04-14Merge branch 'develop' into openapi/accountEgor Kislitsyn
2020-04-14Merge branch 'logger-configuration' into 'develop'feld
Fix for logger configuration through admin-fe See merge request pleroma/pleroma!2365
2020-04-14Merge branch 'chore/spelling' into 'develop'lain
Fix spelling in log message See merge request pleroma/pleroma!2378
2020-04-14Merge branch 'fix/issue_1679' into 'develop'lain
[#1679] fixed logs See merge request pleroma/pleroma!2379
2020-04-14Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1364-no-pushes-from-blocked-domains-users # Conflicts: # lib/pleroma/notification.ex
2020-04-14Merge branch 'issue/1276' into 'develop'Haelwenn
[#1276] An endpoint for getting unread notification count Closes #1276 See merge request pleroma/pleroma!1877
2020-04-14fix logger messageMaksim Pechnikov
2020-04-13Fix spellingMark Felder
2020-04-13Add OpenAPI spec for DomainBlockControllerEgor Kislitsyn
2020-04-13Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-04-13Add OpenAPI spec for CustomEmojiControllerEgor Kislitsyn
2020-04-13Add specs for AccountController.mutes, AccountController.blocks, ↵Egor Kislitsyn
AccountController.mutes, AccountController.endorsements
2020-04-13Add spec for AccountController.followsEgor Kislitsyn
2020-04-13Add specs for AccountController.block and AccountController.unblockEgor Kislitsyn
2020-04-13Add specs for AccountController.mute and AccountController.unmuteEgor Kislitsyn
2020-04-13Add spec for AccountController.unfollowEgor Kislitsyn
2020-04-13Add spec for AccountController.followEgor Kislitsyn
2020-04-13Add spec for AccountController.listsEgor Kislitsyn
2020-04-13Add spec for AccountController.followingEgor Kislitsyn
2020-04-13Add spec for AccountController.followersEgor Kislitsyn