aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2020-04-22Merge branch 'bugfix/1543-streaming-boosts' into 'develop'Haelwenn
Streamer: Stream boosts to the boosting user. Closes #1543 See merge request pleroma/pleroma!2415
2020-04-22Streamer: Stream boosts to the boosting user.lain
2020-04-22Merge branch 'feature/voters-count' into 'develop'Haelwenn
Polls: Persist and show voters' count Closes #1702 See merge request pleroma/pleroma!2411
2020-04-22Merge branch 'worker-messages' into 'develop'Haelwenn
Worker messages Closes #1705 See merge request pleroma/pleroma!2410
2020-04-22static_fe: Add microformats2 classesKarol Kosek
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-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-21Merge branch 'openapi/custom-emojis' into 'develop'lain
Add OpenAPI spec for CustomEmojiController See merge request pleroma/pleroma!2375
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-20Merge branch 'cleanup-subscription-controller' into 'develop'lain
Cleanup SubscriptionController See merge request pleroma/pleroma!2393
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-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-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 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-17[#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks ↵Ivan Tashkinov
when password is provided. Refactored plugs skipping functionality.
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 '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 '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-15Cleanup SubscriptionControllerEgor Kislitsyn
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