aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-13Merge branch 'develop' into test/activity_pub/transmogrifier.exMaksim Pechnikov
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-13Emoji: Add function to detect if a character is an emojilain
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-12Parse http signature for request to objects/activitiesrinpatch
2019-09-12Merge branch 'develop' into test/activity_pub/transmogrifier.exMaksim Pechnikov
2019-09-12Put the cache with the right key when using a tracking functionrinpatch
2019-09-12Track object/create activity fetchesrinpatch
2019-09-12Fix associated test as wellMark Felder
2019-09-12Transmogrifier: Strip internal emoji reaction fields.lain
2019-09-12PleromaAPIController: Add endpoint to fetch emoji reactions.lain
2019-09-12added test for OstatusMaksim Pechnikov
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-11added testsMaksim Pechnikov
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
2019-09-11some changesAlex S
2019-09-11fixAlex S
2019-09-11changelogAlex S
2019-09-11expanding regex sigils to use modifiersAlex S
2019-09-11mix docs generates config.mdAlex S
2019-09-11description formattersAlex S
2019-09-11description.exsAlex S
2019-09-11deleting old config.md fileAlex S
2019-09-11added testsMaksim Pechnikov
2019-09-10Revert "Parallelize template rendering"rinpatch
This reverts commit 1ad71592adb47762287aec8c36d0fca565c38362. Since it had no limit on the number on concurrent processes it OOM killed instances while rendering hellthreads. When I tried introducing a concurrency limit with Task.async_stream/manual folds it lead to about 3 times worse performance on threads larger than 1000 activities (we are talking 30s vs 1.2 minutes), I think this is not worth the about 1.5 times performance increase on smaller threads when using it.
2019-09-10Merge branch 'fix/tests' into 'develop'lain
Fix tests for `Activity.all_by_ids_with_object/1` See merge request pleroma/pleroma!1652
2019-09-11Fix `Activity.all_by_ids_with_object/1` testEgor Kislitsyn
2019-09-10Merge branch 'statuses-by-ids' into 'develop'lain
Add an endpoint to get multiple statuses by IDs Closes #1240 See merge request pleroma/pleroma!1621
2019-09-10added tests /activity_pub/transmogrifier.exMaksim Pechnikov
2019-09-10Add note about limit to the docEgor Kislitsyn
2019-09-10Add an endpoint to get multiple statuses by IDsEgor Kislitsyn
2019-09-10Merge branch 'develop' into feature/moderation-log-filtersMaxim Filippov