aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-22Merge branch 'fix/1689-fix-migrate-to-db' into 'develop'lain
Fix migrate to db config Closes #1689 See merge request pleroma/pleroma!2394
2020-04-22StatusController: Ignore nil scheduled_at parameters.lain
2020-04-22Merge branch 'docs/debian-packages' into 'develop'lain
debian_based_*.md: Use erlang-nox metapackage See merge request pleroma/pleroma!2268
2020-04-22Apply suggestion to docs/installation/debian_based_en.mdlain
2020-04-22Polls: Persist and show voters' countlain
2020-04-22Federator: Return proper values for jobslain
2020-04-22WebPush: Return proper values for jobs.lain
2020-04-21Add OpenAPI schema for FlakeIDEgor Kislitsyn
2020-04-21Improve OpenAPI schemaEgor Kislitsyn
- Removes unneeded wrapping in examples - Adds `:format` attributes
2020-04-21Automatic checks of authentication / instance publicity. Definition of ↵Ivan Tashkinov
missing OAuth scopes in AdminAPIController. Refactoring.
2020-04-21Merge branch 'openapi/custom-emojis' into 'develop'lain
Add OpenAPI spec for CustomEmojiController See merge request pleroma/pleroma!2375
2020-04-21Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1364-no-pushes-from-blocked-domains-users # Conflicts: # CHANGELOG.md
2020-04-20Merge branch 'accept-deletes' into 'develop'rinpatch
Always accept deletions through SimplePolicy, add :reject_deletes group See merge request pleroma/pleroma!2371
2020-04-20Merge branch 'router-cleanup' into 'develop'rinpatch
Cleanup and DRY the Router See merge request pleroma/pleroma!2406
2020-04-20Merge remote-tracking branch 'upstream/develop' into accept-deletesAlex Gleason
2020-04-20Add :reject_deletes option to SimplePolicyAlex Gleason
2020-04-20Add OpenAPI spec for `AccountController.identity_proofs` operationEgor Kislitsyn
2020-04-20Merge branch 'develop' into openapi/accountEgor Kislitsyn
2020-04-20Merge branch 'cleanup-subscription-controller' into 'develop'lain
Cleanup SubscriptionController See merge request pleroma/pleroma!2393
2020-04-20Merge branch 'fix-object_age_policy' into 'develop'lain
Fix ObjectAgePolicy See merge request pleroma/pleroma!2404
2020-04-20Fix ObjectAgePolicyTestIlja
The policy didn't block old posts as it should. * I fixed it and tested on a test server * I added the settings to description so that this information is shown in nodeinfo * TODO: I didn't work TTD and still need to fix the tests
2020-04-20Merge branch 'mrf-docs-update' into 'develop'lain
Expand MRF SimplePolicy docs See merge request pleroma/pleroma!2370
2020-04-20Cleanup and DRY the RouterEgor Kislitsyn
2020-04-19Merge branch '1559-follow-request-notifications' into 'develop'rinpatch
[#1559] Support for "follow_request" notifications Closes #1559 See merge request pleroma/pleroma!2354
2020-04-19Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop'rinpatch
mix.exs: Do not bail out when .git doesn’t exists See merge request pleroma/pleroma!2405
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
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo Closes #1697 See merge request pleroma/pleroma!2403
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, ↵Haelwenn (lanodan) Monnier
electric bongaloo
2020-04-17Merge branch '1682-basic-auth-permissions-fix' into 'develop'rinpatch
[#1682] Fixed Basic Auth permissions issue Closes #1682 See merge request pleroma/pleroma!2401
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
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 23:11:49 +0000