summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-04-21Merge branch 'openapi/custom-emojis' into 'develop'lain
2020-04-20Merge branch 'accept-deletes' into 'develop'rinpatch
2020-04-20Merge branch 'router-cleanup' into 'develop'rinpatch
2020-04-20Merge remote-tracking branch 'upstream/develop' into accept-deletesAlex Gleason
2020-04-20Add :reject_deletes option to SimplePolicyAlex Gleason
2020-04-20Merge branch 'cleanup-subscription-controller' into 'develop'lain
2020-04-20Merge branch 'fix-object_age_policy' into 'develop'lain
2020-04-20Fix ObjectAgePolicyTestIlja
2020-04-20Merge branch 'mrf-docs-update' into 'develop'lain
2020-04-20Cleanup and DRY the RouterEgor Kislitsyn
2020-04-19Merge branch '1559-follow-request-notifications' into 'develop'rinpatch
2020-04-19Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop'rinpatch
2020-04-19mix.exs: Do not bail out when .git doesn’t existsHaelwenn (lanodan) Monnier
2020-04-18Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'Haelwenn
2020-04-17Apply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exsHaelwenn
2020-04-17Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.exHaelwenn
2020-04-17migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electr...Haelwenn (lanodan) Monnier
2020-04-17Merge branch '1682-basic-auth-permissions-fix' into 'develop'rinpatch
2020-04-17Merge branch 'update/pleroma-fe-20200417' into 'develop'Haelwenn
2020-04-17pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4Mark Felder
2020-04-17[#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks w...Ivan Tashkinov
2020-04-17Merge branch 'sideeffects-test' into 'develop'rinpatch
2020-04-17SideEffects: Test for notification creation.lain
2020-04-17Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'rinpatch
2020-04-17Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-reques...Ivan Tashkinov
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
2020-04-17move changelogs entries to unreleased sectionAlexander Strizhakov
2020-04-17Merge branch 'feature/1584-client-captcha-options' into 'develop'Haelwenn
2020-04-17Merge branch 'fix/1694-transfer-task-fix' into 'develop'Haelwenn
2020-04-17Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'Haelwenn
2020-04-17fix for logger configurationAlexander Strizhakov
2020-04-16Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'rinpatch
2020-04-16Merge branch 'fix/1691-feed-render' into 'develop'rinpatch
2020-04-16Merge branch 'features/remove-user-source_data' into 'develop'rinpatch
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
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
2020-04-15Cleanup SubscriptionControllerEgor Kislitsyn
2020-04-15[#2349] Made :skip_plug/2 prevent plug from being executed even if explicitly...Ivan Tashkinov
2020-04-15small fix in the rewrite_policy exampleIlja
2020-04-15Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-...Ivan Tashkinov
2020-04-15Merge branch 'fix/1659-rate-limiter' into 'develop'Haelwenn
2020-04-15remote_ip plug adds remote_ip_found flagAlexander Strizhakov
2020-04-15Merge branch 'uploads-csp-changes' into 'develop'rinpatch
2020-04-15Uploads: Sandbox them in the CSP.lain
generated by cgit v1.2.3 (git 2.44.0) at 2024-05-06 17:47:55 +0000