aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2020-04-17Merge branch 'fix/1694-transfer-task-fix' into 'develop'Haelwenn
Fix for logger configuration Closes #1694 See merge request pleroma/pleroma!2396
2020-04-17Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'Haelwenn
Added need_reboot endpoint to admin api Closes #1677 See merge request pleroma/pleroma!2373
2020-04-17fix for logger configurationAlexander Strizhakov
2020-04-16Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'rinpatch
Enforcement of OAuth scopes check for authenticated API endpoints See merge request pleroma/pleroma!2349
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-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-15remote_ip plug adds remote_ip_found flagAlexander Strizhakov
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-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 '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 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-13Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
output-of-relationships-in-statuses
2020-04-13fix for logger configuration through admin-feAlexander Strizhakov
2020-04-12Merge branch 'fix/mix-tasks-failing-otp' into 'develop'rinpatch
Fix mix tasks failing on OTP releases Closes #1678 See merge request pleroma/pleroma!2369
2020-04-12Fix mix tasks failing on OTP releasesrinpatch
No idea why this was even added. Closes #1678
2020-04-11Merge branch 'following-relationships-optimizations' into 'develop'rinpatch
FollowingRelationship storage & performance optimizations See merge request pleroma/pleroma!2332
2020-04-11Remove User.upgrade_changeset in favor of remote_user_creationrinpatch
The two changesets had the same purpose, yet some changes were updated in one, but not the other (`uri`, for example). Also makes `Transmogrifier.upgrade_user_from_ap_id` be called from `ActivityPub.make_user_from_ap_id` only when the user is actually not AP enabled yet. I did not bother rewriting tests that used `User.insert_or_update` to use the changeset instead because they seemed to just test the implementation, rather than behavior.
2020-04-10Merge branch 'develop' into fix/support-conversations-paginationEgor Kislitsyn
2020-04-10Merge branch 'bugfix/apc2s_upload_activity' into 'develop'Haelwenn
bugfix: AP C2S activity with attachments See merge request pleroma/pleroma!2316
2020-04-10User: remove source_dataHaelwenn (lanodan) Monnier
2020-04-10Remove User.fields/1Haelwenn (lanodan) Monnier
2020-04-10profile emojis in User.emoji instead of source_dataHaelwenn (lanodan) Monnier
2020-04-10User: Move inbox & shared_inbox to own fieldsHaelwenn (lanodan) Monnier
2020-04-10formatter: Use user.uri instead of user.source_data.uriHaelwenn (lanodan) Monnier
2020-04-10Types.URI: NewHaelwenn (lanodan) Monnier
2020-04-10User: Move public_key from source_data to own fieldHaelwenn (lanodan) Monnier
2020-04-10User: remove source_data use for follower_address and following_addressHaelwenn (lanodan) Monnier
2020-04-09Add `/api/v1/notifications/:id/dismiss` endpointEgor Kislitsyn
2020-04-09Merge branch 'fix/1658-invite-send' into 'develop'lain
Error improvement for email_invite endpoint See merge request pleroma/pleroma!2344
2020-04-09typo fixAlexander Strizhakov
2020-04-09Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.exAlexander Strizhakov
2020-04-09Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.exAlexander Strizhakov
2020-04-09Merge branch 'open-api' into 'develop'lain
Add OpenAPI Closes pleroma-meta#19 See merge request pleroma/pleroma!2345
2020-04-09Merge branch 'formatter-html-safe' into 'develop'lain
formatter.ex: Use Phoenix.HTML for mention/hashtag generation See merge request pleroma/pleroma!2357