aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-04-06tests for emoji mix taskAlexander Strizhakov
2020-04-02Merge branch 'fix/docs-markdown' into 'develop'feld
2020-04-02Fix formatting in documentationEgor Kislitsyn
2020-04-02Merge branch '2323-accounts-relationships-hotfix' into 'develop'feld
2020-04-02[#2323] Fixed a typo causing /accounts/relationships to render default relati...Ivan Tashkinov
2020-04-01Merge branch 'update/adminfe-20200331' into 'develop'feld
2020-04-01Merge branch 'gun' into 'develop'feld
2020-04-01Merge branch 'fix/1601-add-new-meta-tag' into 'develop'rinpatch
2020-04-01restrict remote users from indexingAlexander Strizhakov
2020-04-01Merge branch 'ops/fix-ci' into 'develop'Haelwenn
2020-03-31remove testing `only:` in docker buildjp
2020-03-31add imagemagick and update inherited container to alpine:3.11jp
2020-03-31Merge branch 'fix/docker-mogrify' into 'develop'feld
2020-03-31Remove problematic --cache-from argumentMark Felder
2020-03-31Merge branch 'bugfix/funkwhale-channel' into 'develop'Haelwenn
2020-03-31Provide known-good user.uri, remove User.profile_url/1Haelwenn (lanodan) Monnier
2020-03-31User: Fix use of source_data in profile_url/1Haelwenn (lanodan) Monnier
2020-03-31Initial failing test statement against funkwhale channelsHaelwenn (lanodan) Monnier
2020-03-31Merge branch 'fix/docker-mogrify' into 'develop'feld
2020-03-31Add imagemagick to Docker image to fix broken mogrify pluginMark Felder
2020-03-31Update AdminFE build in preparation for Pleroma 2.0.2Mark Felder
2020-03-30Merge branch 'benchmark-improvements' into 'develop'lain
2020-03-30Merge branch 'removing-grouped-reports' into 'develop'rinpatch
2020-03-30removing grouped reports admin api endpointAlexander Strizhakov
2020-03-30updating gun with bug fixAlexander Strizhakov
2020-03-30changelog fixAlexander Strizhakov
2020-03-30Merge branch 'develop' into gunAlexander Strizhakov
2020-03-30use in timelines benchmark new user generatorAlexander Strizhakov
2020-03-30fixAlexander Strizhakov
2020-03-30sync with developAlexander Strizhakov
2020-03-30activities generation tasksAlexander Strizhakov
2020-03-29Merge branch 'feature/funkwhale-audio' into 'develop'Haelwenn
2020-03-27Merge branch 'relations-preloading-for-statuses-rendering' into 'develop'lain
2020-03-27Misc refactoring / tweaks (`ThreadMute.exists?/2`).Ivan Tashkinov
2020-03-26Ensured no auxiliary computations (actors list preparation etc.) related to r...Ivan Tashkinov
2020-03-26Merge remote-tracking branch 'remotes/origin/develop' into relations-preloadi...Ivan Tashkinov
2020-03-25Merge branch 'benchmark_timeline' into 'develop'rinpatch
2020-03-25Merge branch '1364-notifications-sending-control' into 'develop'rinpatch
2020-03-25Merge remote-tracking branch 'remotes/origin/develop' into relations-preloadi...Ivan Tashkinov
2020-03-25Further preloading (more endpoints), refactoring, tests.Ivan Tashkinov
2020-03-25Apply suggestion to benchmarks/load_testing/generator.exlain
2020-03-25Merge branch 'add-test-update_credentials' into 'develop'Haelwenn
2020-03-25Add a test for accounts/update_credentialsEgor Kislitsyn
2020-03-25Applied relationships preloading to GET /api/v1/accounts/relationships. Refac...Ivan Tashkinov
2020-03-25[#1364] Minor improvements / comments.Ivan Tashkinov
2020-03-25Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications...Ivan Tashkinov
2020-03-25Fixed incorrect usage of "relations" as a short form of "relationships".Ivan Tashkinov
2020-03-24Merge remote-tracking branch 'remotes/origin/develop' into relations-preloadi...Ivan Tashkinov
2020-03-24Implemented preloading of relationships with parent activities' actors for st...Ivan Tashkinov
2020-03-24Merge branch 'fix/activity-deletion' into 'develop'feld