Commit Graph

9175 Commits (f685cbd30940b3fd92a2f6c8a161729bc2ceaab6)
 

Author SHA1 Message Date
Ivan Tashkinov f685cbd309 Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
4 years ago
lain 3c828016d9 Merge branch 'openapi/custom-emojis' into 'develop'
4 years ago
rinpatch e57c1b60e4 Merge branch 'accept-deletes' into 'develop'
4 years ago
rinpatch 7e456ac7f6 Merge branch 'router-cleanup' into 'develop'
4 years ago
Alex Gleason bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes
4 years ago
Alex Gleason b54c8813d6
Add :reject_deletes option to SimplePolicy
4 years ago
lain 28165dad3a Merge branch 'cleanup-subscription-controller' into 'develop'
4 years ago
lain baeb9fb451 Merge branch 'fix-object_age_policy' into 'develop'
4 years ago
Ilja 8b4de61d64 Fix ObjectAgePolicyTest
4 years ago
lain 617a9f6208 Merge branch 'mrf-docs-update' into 'develop'
4 years ago
Egor Kislitsyn 258d897579 Cleanup and DRY the Router
4 years ago
rinpatch 918a8094fc Merge branch '1559-follow-request-notifications' into 'develop'
4 years ago
rinpatch 389fb36fb5 Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier c906ffc51a
mix.exs: Do not bail out when .git doesn’t exists
4 years ago
Haelwenn 79445ae5d2 Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'
4 years ago
Haelwenn d698ecef9b Apply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exs
4 years ago
Haelwenn 24f760c2f7 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex
4 years ago
Haelwenn (lanodan) Monnier eb61564005
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
4 years ago
rinpatch f1843db41d Merge branch '1682-basic-auth-permissions-fix' into 'develop'
4 years ago
Haelwenn e303d80dcb Merge branch 'update/pleroma-fe-20200417' into 'develop'
4 years ago
Mark Felder 24e0db6310 pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4
4 years ago
Ivan Tashkinov 66f55106bd [#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.
4 years ago
rinpatch e0d7847bc5 Merge branch 'sideeffects-test' into 'develop'
4 years ago
lain 26d9c83316 SideEffects: Test for notification creation.
4 years ago
rinpatch 6936854878 Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'
4 years ago
Ivan Tashkinov 6e6f95c6ae Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
4 years ago
Haelwenn (lanodan) Monnier 46f051048f
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
4 years ago
Haelwenn 09bd1d12c1 Merge branch 'sync-changelog' into 'develop'
4 years ago
Alexander Strizhakov 4d22b100b7
move changelogs entries to unreleased section
4 years ago
Haelwenn a17bfb5fab Merge branch 'feature/1584-client-captcha-options' into 'develop'
4 years ago
Haelwenn d8142ee6fe Merge branch 'fix/1694-transfer-task-fix' into 'develop'
4 years ago
Haelwenn 9c76d70a47 Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'
4 years ago
Alexander Strizhakov 304ea09f4c
fix for logger configuration
4 years ago
rinpatch badd888ccb Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
4 years ago
rinpatch 28bcde5d98 Merge branch 'fix/1691-feed-render' into 'develop'
4 years ago
rinpatch 0ddee13c83 Merge branch 'features/remove-user-source_data' into 'develop'
4 years ago
rinpatch 942d7467ca Merge branch 'develop' into features/remove-user-source_data
4 years ago
Alexander Strizhakov 4d330d9df1
fix for use of published from different entities
4 years ago
rinpatch 252528a4b9 Merge branch 'refactor/remove-upgrade-changeset' into 'develop'
4 years ago
rinpatch 77ee64b993 user: remove blank?
4 years ago
Alexander Strizhakov 72ef6cc4f2
added need_reboot endpoint to admin api
4 years ago
lain 2b57f73b77 Merge branch 'small-fix-rewrite_policy' into 'develop'
4 years ago
Egor Kislitsyn cf4ebba774
Cleanup SubscriptionController
4 years ago
Ivan Tashkinov bde1189c34 [#2349] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests.
4 years ago
Ilja aa0a4a1e78 small fix in the rewrite_policy example
4 years ago
Ivan Tashkinov bedf92e064 Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement
4 years ago
Haelwenn b1c1d2e5e1 Merge branch 'fix/1659-rate-limiter' into 'develop'
4 years ago
Alexander Strizhakov 22bde21c4f
remote_ip plug adds remote_ip_found flag
4 years ago
rinpatch ad8630b95a Merge branch 'uploads-csp-changes' into 'develop'
4 years ago
lain 6bc76df287 Uploads: Sandbox them in the CSP.
4 years ago