summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-16Restore tests for `change_password` and `delete_account`Egor Kislitsyn
2019-09-15Merge branch '1149-oban-job-queue' into 'develop'rinpatch
[#1149] `oban`-based job & retry queues Closes #1149 See merge request pleroma/pleroma!1518
2019-09-15[#1149] Reinstated docs/config.md changes.Ivan Tashkinov
2019-09-15[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1149-oban-job-queue # Conflicts: # docs/config.md
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
2019-09-14Merge branch 'fix/truncate-remote-user-fields' into 'develop'rinpatch
Truncate remote user fields See merge request pleroma/pleroma!1619
2019-09-14[#1149] Rewritten readme as config/description.exs.Ivan Tashkinov
2019-09-14[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1149-oban-job-queue # Conflicts: # docs/config.md # mix.lock
2019-09-14Merge branch 'fix-tests' into 'develop'rinpatch
Fix `Activity.all_by_actor_and_id/2` test See merge request pleroma/pleroma!1668
2019-09-14Fix `Activity.all_by_actor_and_id/2` testEgor Kislitsyn
2019-09-14Merge branch 'security/fav-reblog-access-control' into 'develop'rinpatch
Mastodon API: Respect post privacy in favourited/reblogged endpoints See merge request pleroma/pleroma!1667
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
Capture test error messages where appropriate See merge request pleroma/pleroma!1665
2019-09-13Merge branch 'refactor/add_link_headers' into 'develop'lain
Refactor `add_link_headers/7` -> `add_link_headers/3` See merge request pleroma/pleroma!1636
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
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
2019-09-11don't add behaviour to suggestionsAlex S
2019-09-11Apply suggestion to config/description.exsAlexander Strizhakov
2019-09-11Apply suggestion to config/description.exsAlexander Strizhakov
2019-09-11little fixAlex S
2019-09-11typo fixAlex S
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-10 08:00:14 +0000