summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-27Do not allow deactivated auth to pass mongooseim checksmongoose-im-deactivated-usersHannah Ward
2020-04-26Merge branch 'img-src-blob' into 'develop'rinpatch
Let blob: pass CSP See merge request pleroma/pleroma!2427
2020-04-26Let blob: pass CSPAlex Gleason
2020-04-25Merge branch '1706-dm-timeline-failure-fix' into 'develop'lain
[#1706] Prevented error on unresolved activity actors for timeline actions Closes #1706 See merge request pleroma/pleroma!2425
2020-04-25[#1706] Formatting fix.Ivan Tashkinov
2020-04-25[#1706] Prevented error on unresolved activity actors for timeline actions.Ivan Tashkinov
2020-04-24Merge branch 'bugfix/announce-race-condition' into 'develop'rinpatch
Announcements: Prevent race condition. See merge request pleroma/pleroma!2423
2020-04-24Merge branch 'reply-filtering-refactor' into 'develop'lain
Reply filtering refactor See merge request pleroma/pleroma!2424
2020-04-24Reply Filtering: Refactor.lain
2020-04-24Merge branch 'openapi-improvements' into 'develop'lain
Support validation for inline OpenAPI schema and automatic tests for examples Closes #1696 See merge request pleroma/pleroma!2421
2020-04-24Apply suggestion to CHANGELOG.mdlain
2020-04-24Update differences_in_mastoapi_responses.mdlain
2020-04-24bench syncAlexander Strizhakov
2020-04-24updating benchmarksAlexander Strizhakov
2020-04-24formattingAlexander
2020-04-24reply filteringAlexander
2020-04-24Announcements: Prevent race condition.lain
2020-04-24Merge branch 'feature/remove-unused-like-code' into 'develop'lain
ActivitPub: Remove `like` function. See merge request pleroma/pleroma!2422
2020-04-24Credo fixes.lain
2020-04-24ActivitPub: Remove `like` function.lain
We don't need another way to build likes.
2020-04-24Support validation for inline OpenAPI schema and automatic tests for examplesEgor Kislitsyn
2020-04-23Merge branch 'bugfix/repeating-announce' into 'develop'rinpatch
CommonAPI: Don't make repeating announces possible See merge request pleroma/pleroma!2418
2020-04-23CommonAPI: Don't make repeating announces possiblelain
2020-04-23Merge branch 'bugfix/null-scheduled-at' into 'develop'rinpatch
StatusController: Ignore nil scheduled_at parameters. Closes #1699 See merge request pleroma/pleroma!2412
2020-04-22Merge branch 'bugfix/1629-fav-race-condition' into 'develop'lain
SideEffects: Run in transaction. Closes #1629 See merge request pleroma/pleroma!2417
2020-04-22SideEffects: Use less cryptic syntax.lain
2020-04-22Merge branch 'bugfix/1670-user-count' into 'develop'Haelwenn
Stats: Ignore internal users for user count. Closes #1670 See merge request pleroma/pleroma!2414
2020-04-22Stats: Use `invisible` property for filtering.lain
2020-04-22SideEffects: Run in transaction.lain
This fixes race conditions.
2020-04-22Merge branch 'fix/follow-and-blocks-import' into 'develop'Haelwenn
Fix follower/blocks import when nicknames starts with @ Closes #1698 See merge request pleroma/pleroma!2416
2020-04-22Merge branch 'bugfix/following-fix-status-code' into 'develop'Haelwenn
AccountController: Use code 400 for self-follow. Closes #1674 See merge request pleroma/pleroma!2413
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-22Update CHANGELOGEgor Kislitsyn
2020-04-22Fix Oban warningEgor Kislitsyn
Warning example: [warn] Expected Elixir.Pleroma.Workers.BackgroundWorker.perform/2 to return :ok, {:ok, value}, or {:error, reason}. Instead received: [error: "not found @user@server.party", error: "not found "] The job will be considered a success.
2020-04-22Fix blocks importEgor Kislitsyn
2020-04-22Fix follow importEgor Kislitsyn
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-22Merge branch 'microformats' into 'develop'lain
static_fe: Add microformats2 classes See merge request pleroma/pleroma!2215
2020-04-22static_fe: Add microformats2 classesKarol Kosek
2020-04-22Stats: Ignore internal users for user count.lain
2020-04-22AccountController: Use code 400 for self-follow.lain
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