summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-09-30Merge branch 'chore/maint-1.1-1.1.0-rc1' into 'maint/1.1'v1.0.90kaniini
2019-09-30Pleroma 1.0.90 (aka 1.1 RC1).Ariadne Conill
2019-09-30Merge branch 'cherry-pick-compact-undos' into 'maint/1.1'kaniini
2019-09-30Transmogrifier: Handle compact objects in undos.lain
2019-09-30Merge branch 'cherry-pick-7c9b023a' into 'maint/1.1'rinpatch
2019-09-30Merge branch 'ci/build-otp-maint' into 'develop'kaniini
2019-09-30Merge branch 'chore/pleroma-fe-20190930-to-maint' into 'maint/1.1'kaniini
2019-09-30update pleroma feAriadne Conill
2019-09-26Merge branch 'backport/1.1-hackney-and-outbox-fixes' into 'maint/1.1'rinpatch
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
2019-09-26mix.lock: Bump hackney to 1.15.2Haelwenn (lanodan) Monnier
2019-09-19Merge branch 'update/admin-fe-stable' into 'maint/1.1'kaniini
2019-09-18Update AdminFE for 1.1 branchMark Felder
2019-09-17Merge branch 'cherry-pick-764931fc' into 'maint/1.1'rinpatch
2019-09-17Merge branch 'deps/update-tesla' into 'develop'feld
2019-09-14Merge branch 'cherry-pick-3ae448b5' into 'maint/1.1'rinpatch
2019-09-14Merge branch 'fix-tests' into 'develop'rinpatch
2019-09-14Merge branch 'cherry-pick-9c64a257' into 'maint/1.1'rinpatch
2019-09-14Merge branch 'config-changes' into 'develop'rinpatch
2019-09-14Merge branch 'backport/fav-reblog-access-control' into 'maint/1.1'rinpatch
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
2019-09-13Merge branch 'feature/change-email' into 'develop'Haelwenn
2019-09-13Merge branch 'admin-config-description' into 'develop'rinpatch
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
2019-09-13Fix admin api docs for creating usersAngelina Filippova
2019-09-12Merge branch 'fix/error-log-double-quotes' into 'develop'Haelwenn
2019-09-12Fix associated test as wellMark Felder
2019-09-11Fix double quotes in error logsMark Felder
2019-09-11Merge branch 'feature/jason-view-render' into 'develop'kaniini
2019-09-11Use Jason for rendering responsesrinpatch
2019-09-11Merge branch 'patch-5' into 'develop'Haelwenn
2019-09-11Merge branch 'fix/oom-parallel-rendering' into 'develop'lain
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
generated by cgit v1.2.3 (git 2.44.0) at 2024-05-07 16:34:05 +0000