aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-30Transmogrifier: Handle compact objects in undos.lain
2019-09-30Merge branch 'cherry-pick-7c9b023a' into 'maint/1.1'rinpatch
Backport !1749 to 1.1 See merge request pleroma/pleroma!1751
2019-09-30Merge branch 'ci/build-otp-maint' into 'develop'kaniini
CI: Enable OTP release building for maint/* branches See merge request pleroma/pleroma!1749 (cherry picked from commit 7c9b023a918c84b60ae6547289a083c671a3659b) 71315800 CI: Enable OTP release building for maint/* branches
2019-09-30Merge branch 'chore/pleroma-fe-20190930-to-maint' into 'maint/1.1'kaniini
maint/1.1: update pleroma fe See merge request pleroma/pleroma!1750
2019-09-30update pleroma feAriadne Conill
2019-09-26Merge branch 'backport/1.1-hackney-and-outbox-fixes' into 'maint/1.1'rinpatch
Backport/1.1 hackney and outbox fixes See merge request pleroma/pleroma!1718
2019-09-26Lintingrinpatch
2019-09-26Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.exrinpatch
2019-09-26Credo considered harmfulrinpatch
2019-09-26Remove useless with clauserinpatch
2019-09-26Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.exrinpatch
2019-09-26Don't embed the first page in inboxes/outboxes and refactor the views torinpatch
follow View/Controller pattern Note that I mentioned the change in 1.1 section because I intend to backport this, if this is not needed I will move it back to Unreleased.
2019-09-26mix.lock: Bump hackney to 1.15.2Haelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1267
2019-09-19Merge branch 'update/admin-fe-stable' into 'maint/1.1'kaniini
Update AdminFE for 1.1 branch See merge request pleroma/pleroma!1693
2019-09-18Update AdminFE for 1.1 branchMark Felder
Latest build of AdminFE with Settings disabled as the feature is not stable yet
2019-09-17Merge branch 'cherry-pick-764931fc' into 'maint/1.1'rinpatch
Cherry pick tesla update to 1.1 See merge request pleroma/pleroma!1687
2019-09-17Merge branch 'deps/update-tesla' into 'develop'feld
Update Tesla to 1.3 Closes #1262 See merge request pleroma/pleroma!1684 (cherry picked from commit 764931fc9f5eecc30c1ccb3b5bacf6338fcdf706) 8d812c28 Update Tesla to 1.3
2019-09-14Merge branch 'cherry-pick-3ae448b5' into 'maint/1.1'rinpatch
Backport a test fix to 1.1 See merge request pleroma/pleroma!1671
2019-09-14Merge branch 'fix-tests' into 'develop'rinpatch
Fix `Activity.all_by_actor_and_id/2` test See merge request pleroma/pleroma!1668 (cherry picked from commit 3ae448b592214b43af1d079c997c6f6b91d31aeb) b870ae08 Fix `Activity.all_by_actor_and_id/2` test
2019-09-14Merge branch 'cherry-pick-9c64a257' into 'maint/1.1'rinpatch
Backport config.md readdition to 1.1 See merge request pleroma/pleroma!1670
2019-09-14Merge branch 'config-changes' into 'develop'rinpatch
two separate files for config.md and generated config.md See merge request pleroma/pleroma!1666 (cherry picked from commit 9c64a25713790fefa8b5c419aeadf55113c17073) 69faec03 markdown generation to the new file c625fe6f config.md back 4da0da9a don't track generated_config.md
2019-09-14Merge branch 'backport/fav-reblog-access-control' into 'maint/1.1'rinpatch
Backport/fav reblog access control See merge request pleroma/pleroma!1669
2019-09-14Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exsrinpatch
2019-09-14Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exsrinpatch
2019-09-14Mastodon API: Respect post privacy in favourited/reblogged endpointsrinpatch
2019-09-13Merge branch 'cleanup-activity' into 'develop'lain
Cleanup `Pleroma.Activity` and add more tests See merge request pleroma/pleroma!1623
2019-09-13Merge branch 'feature/change-email' into 'develop'Haelwenn
Add email change endpoint Closes #1156 See merge request pleroma/pleroma!1580
2019-09-13Merge branch 'admin-config-description' into 'develop'rinpatch
Admin config description Closes #1178 and #1209 See merge request pleroma/pleroma!1611
2019-09-13Add a note about compatibility with MastodonEgor Kislitsyn
2019-09-13Add email change endpointEgor Kislitsyn
2019-09-13Add more tests for Pleroma.ActivityEgor Kislitsyn
2019-09-13Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.UtilsEgor Kislitsyn
2019-09-13Merge branch 'fix/admin-api-docs' into 'develop'kaniini
Fix admin api docs for creating users See merge request pleroma/pleroma!1660
2019-09-13Fix admin api docs for creating usersAngelina Filippova
2019-09-12Merge branch 'fix/error-log-double-quotes' into 'develop'Haelwenn
Fix double quotes in error logs See merge request pleroma/pleroma!1656
2019-09-12Fix associated test as wellMark Felder
2019-09-11Fix double quotes in error logsMark Felder
Example: pleroma: [error] Couldn't fetch ""https://pleroma.soykaf.com/objects/6288a14b-0623-40fc-a26a-0d358f8a11ca"", error: nil
2019-09-11Merge branch 'feature/jason-view-render' into 'develop'kaniini
Use Jason for rendering responses See merge request pleroma/pleroma!1655
2019-09-11Use Jason for rendering responsesrinpatch
Although Jason readme says Phoenix 1.4+ already does it by default, [it actually does it only for new projects](https://github.com/phoenixframework/phoenix/blob/3bfb9f6e900c9a2e31cb95736e2cb5bdad329b61/lib/phoenix.ex#L58-L59)
2019-09-11Merge branch 'patch-5' into 'develop'Haelwenn
Mastodon API: URI encode hashtag name in generated URLs See merge request pleroma/pleroma!1642
2019-09-11Merge branch 'fix/oom-parallel-rendering' into 'develop'lain
Revert "Parallelize template rendering" See merge request pleroma/pleroma!1654
2019-09-11Add extended benchmarkrinpatch
2019-09-11web_cache_ttl descriptionAlex S
2019-09-11refactoringAlex S
2019-09-11little refactorAlex S
2019-09-11some changesAlex S
2019-09-11placeholder for config.mdAlex S
2019-09-11little fixAlex S
2019-09-11bump ex_doc versionAlex S
2019-09-11formattingAlex S
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-25 09:12:30 +0000