summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-17Merge branch 'update/pleroma-fe-20200417' into 'develop'Haelwenn
pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4 See merge request pleroma/pleroma!2402
2020-04-17pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4Mark Felder
2020-04-17[#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks ↵Ivan Tashkinov
when password is provided. Refactored plugs skipping functionality.
2020-04-17Improve OpenAPI errorsEgor Kislitsyn
2020-04-17Merge branch 'sideeffects-test' into 'develop'rinpatch
SideEffects: Test for notification creation. See merge request pleroma/pleroma!2399
2020-04-17SideEffects: Test for notification creation.lain
2020-04-17Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'rinpatch
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering Closes #1695 See merge request pleroma/pleroma!2398
2020-04-17Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1559-follow-request-notifications # Conflicts: # CHANGELOG.md
2020-04-17migrations/20200406100225_users_add_emoji: Fix tag to Emoji filteringHaelwenn (lanodan) Monnier
2020-04-17don't restart postgrexAlexander Strizhakov
2020-04-17Merge branch 'sync-changelog' into 'develop'Haelwenn
Move changelog entries to unreleased section See merge request pleroma/pleroma!2397
2020-04-17move changelogs entries to unreleased sectionAlexander Strizhakov
2020-04-17Merge branch 'feature/1584-client-captcha-options' into 'develop'Haelwenn
Creating trusted app from adminFE & mix task Closes #1584 See merge request pleroma/pleroma!2252
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 'features/remove-user-source_data' into 'develop'rinpatch
User: remove source_data Closes #820 See merge request pleroma/pleroma!2339
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-16Merge branch 'small-fix-rewrite_policy' into 'develop'lain
small fix in the rewrite_policy example See merge request pleroma/pleroma!2391
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-15small fix in the rewrite_policy exampleIlja
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-15Merge branch 'uploads-csp-changes' into 'develop'rinpatch
Uploads: Sandbox them in the CSP. See merge request pleroma/pleroma!2389
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-14Merge branch 'fix/richmedia-oban-error' into 'develop'feld
Attempt at fixing Oban not receiving :ok from RichMediaHelper job Closes #1684 See merge request pleroma/pleroma!2377
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-07 15:48:49 +0000