aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-09-16Merge branch 'feature/optimize_rich_media_parser' into 'develop'kaniini
2019-09-16Merge branch 'fix/race-in-tests' into 'develop'kaniini
2019-09-16Fix a race condition in testsEgor Kislitsyn
2019-09-15Merge branch '1149-oban-job-queue' into 'develop'rinpatch
2019-09-15added prepare html for RichMedia.ParserMaksim Pechnikov
2019-09-15[#1149] Reinstated docs/config.md changes.Ivan Tashkinov
2019-09-15[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oba...Ivan Tashkinov
2019-09-14Merge branch 'config-changes' into 'develop'rinpatch
2019-09-14Merge branch 'fix/truncate-remote-user-fields' into 'develop'rinpatch
2019-09-14[#1149] Rewritten readme as config/description.exs.Ivan Tashkinov
2019-09-14[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oba...Ivan Tashkinov
2019-09-14Merge branch 'fix-tests' into 'develop'rinpatch
2019-09-14Fix `Activity.all_by_actor_and_id/2` testEgor Kislitsyn
2019-09-14Merge branch 'security/fav-reblog-access-control' into 'develop'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 'capture-test-errors' into 'develop'lain
2019-09-13Merge branch 'refactor/add_link_headers' into 'develop'lain
2019-09-13don't track generated_config.mdAlex S
2019-09-13config.md backAlex S
2019-09-13markdown generation to the new fileAlex S
2019-09-13Capture test error messages where appropriatestwf
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
2019-09-11little fixAlex S
2019-09-11bump ex_doc versionAlex S
2019-09-11formattingAlex S
2019-09-11don't add behaviour to suggestionsAlex S
2019-09-11Apply suggestion to config/description.exsAlexander Strizhakov