summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-08-17UserController: fall back to frontend when user isn't founduserfeed-fe-fallbackAlex Gleason
2021-08-08Merge branch 'release/2.4.0' into 'stable'v2.4.0Haelwenn
Release/2.4.0 See merge request pleroma/pleroma!3493
2021-08-08Update PleromaFE Bundle (2.4.0)Haelwenn (lanodan) Monnier
based on 51d3d8d255de221f7ac99e41f2f8e56c7d6a21a9
2021-08-06CHANGELOG.md: Fix instances of 2020 being actually 2021matildepark
2021-08-01Release 2.4.0Haelwenn (lanodan) Monnier
2021-08-01Update AdminFE bundleHaelwenn (lanodan) Monnier
2021-07-27Merge branch 'object-tombstone-visibility' into 'develop'feld
Visibility: check Tombstone objects in visible_for_user?/2 See merge request pleroma/pleroma!3490
2021-07-27Merge branch 'errorview-json-fix' into 'develop'feld
Fix errors in ErrorView See merge request pleroma/pleroma!3489
2021-07-27Merge remote-tracking branch 'pleroma/develop' into object-tombstone-visibilityAlex Gleason
2021-07-27Visibility: check Tombstone objects in visible_for_user?/2Alex Gleason
2021-07-27CHANGELOG: fixed JSON error renderingAlex Gleason
2021-07-27Merge remote-tracking branch 'pleroma/develop' into errorview-json-fixAlex Gleason
2021-07-27Add activity+json to Phoenix :format_encodersAlex Gleason
Fixes ErrorView rendering
2021-07-22Merge branch 'mkljczk-develop-patch-60115' into 'develop'Haelwenn
MastodonAPI: Fix list timelines Closes mastofe#89 and #2693 See merge request pleroma/pleroma!3477
2021-07-14Merge branch 'admin-api-users-sort' into 'develop'feld
AdminAPI: sort new users at the top Closes #2709 See merge request pleroma/pleroma!3481
2021-07-14Merge branch 'admin-api-users-date' into 'develop'feld
AdminAPI: add created_at date to users See merge request pleroma/pleroma!3482
2021-07-14CHANGELOG: AdminAPI return date with usersAlex Gleason
2021-07-14Merge remote-tracking branch 'pleroma/develop' into admin-api-users-dateAlex Gleason
2021-07-14AdminAPI: add date to usersAlex Gleason
2021-07-13CHANGELOG: AdminAPI users sortAlex Gleason
2021-07-13Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sortAlex Gleason
2021-07-13AdminAPI: sort user results by ID descendingAlex Gleason
2021-07-12Merge branch 'features/ingestion-page' into 'develop'Haelwenn
Pipeline Ingestion: Page See merge request pleroma/pleroma!3097
2021-07-12Merge branch 'features/validators-apc2s' into 'develop'Haelwenn
AP C2S: Remove restrictions and make it go through pipeline See merge request pleroma/pleroma!3203
2021-07-12AP C2S: Remove restrictions and make it go through pipelineHaelwenn (lanodan) Monnier
2021-07-08Merge branch 'update/linkify' into 'develop'feld
Update Linkify See merge request pleroma/pleroma!3478
2021-07-08Update Linkify to fix crash on posts with a URL we failed to parse correctlyMark Felder
2021-07-06Merge branch 'remote-deletions' into 'develop'feld
Fix user deletion problems See merge request pleroma/pleroma!3476
2021-07-02fix the fucking list timelines on mastofe/soapbox-femarcin mikołajczak
2021-06-30Deletions: change User.purge/1 to defp, add CHANGELOG entryAlex Gleason
2021-06-30Merge remote-tracking branch 'pleroma/develop' into remote-deletionsAlex Gleason
2021-06-30Deletions: don't purge keys so Delete/Undo activities can be signedAlex Gleason
2021-06-30Deletions: allow deactivated users to be deletedAlex Gleason
2021-06-29Deletions: preserve account status fields during purge, fix checksAlex Gleason
2021-06-29Also purge the user in User.perform/2Alex Gleason
2021-06-29Deletions: purge the user immediatelyAlex Gleason
2021-06-29Correctly purge a remote userAlex Gleason
2021-06-25Merge branch 'fix-2686' into 'develop'Haelwenn
Activity deletion: fix FunctionClauseError, fixes #2686 Closes #2686 See merge request pleroma/pleroma!3475
2021-06-24Activity deletion: fix FunctionClauseError #2686Alex Gleason
2021-06-23Merge branch 'ecto-upgrade' into 'develop'feld
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain See merge request pleroma/pleroma!3473
2021-06-23Upgrade Ecto to v3.6.2, remove deprecated ecto_explainAlex Gleason
2021-06-22Merge branch 'bugfix/upload-limit-plug' into 'develop'Haelwenn
Downgrade Plug to 1.10.x, revert upload_limit tuple to function change See merge request pleroma/pleroma!3472
2021-06-22Merge branch 'docs/dependencies-rewrite' into 'develop'feld
Rewrite docs related to dependencies See merge request pleroma/pleroma!3466
2021-06-22Add test on changing [:instance, :upload_limit]Haelwenn (lanodan) Monnier
2021-06-22Downgrade Plug to 1.10.x, revert upload_limit tuple to function changeHaelwenn (lanodan) Monnier
This should fix setting the upload limit in the database as found in: https://queer.hacktivis.me/notice/A8XUZp74Cg7eYNEMxU This reverts commit 7d350b73f58664eb822efaa5f522fcf2bd38f669.
2021-06-11Merge branch 'cycles-ci-skip' into 'develop'Haelwenn
Cycles CI: skip unless Elixir code is modified See merge request pleroma/pleroma!3467
2021-06-11Cycles CI: skip unless Elixir code is modifiedAlex Gleason
2021-06-11docs/…/opt_en.md: Reuse /main/ repository url for the /community/ repoHaelwenn (lanodan) Monnier
2021-06-11docs: Remove Erlang Solutions repositoryHaelwenn (lanodan) Monnier
2021-06-11docs: Use one file to describe dependenciesHaelwenn (lanodan) Monnier