aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-05-15Merge branch 'fix/digest-task-otp' into 'develop'lain
2020-05-15Merge branch 'fix/database-config' into 'develop'lain
2020-05-15returning partial chainAlexander Strizhakov
2020-05-15Merge branch 'openapi/nullable-request-fields' into 'develop'rinpatch
2020-05-15[OpenAPI] Mark all not required request fields as nullableEgor Kislitsyn
2020-05-15Merge branch 'weblate-pleroma-pleroma' into 'develop'rinpatch
2020-05-14Translated using Weblate (Polish)Michał Sidor
2020-05-14Translated using Weblate (Polish)Michał Sidor
2020-05-14Added translation using Weblate (Polish)Michał Sidor
2020-05-14Merge branch 'feature/database-configuration-whitelist' into 'develop'rinpatch
2020-05-14Add config migration disclaimer to config whitelist documentationStephanie Wilde-Hobbs
2020-05-14Merge branch 'bcrypt-auth' into 'develop'lain
2020-05-14Pbkdf2.verify_pass --> AuthenticationPlug.checkpwAlex Gleason
2020-05-14Add Changelog entryStephanie Wilde-Hobbs
2020-05-14Allow whitelisting whole groupsStephanie Wilde-Hobbs
2020-05-14Style fixesSteph
2020-05-14Merge branch 'features/openrc-console' into 'develop'lain
2020-05-14Merge branch 'openapi/pleroma-api/accounts' into 'develop'lain
2020-05-14Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_opera...lain
2020-05-14Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_opera...lain
2020-05-14Merge branch 'pleroma_internal' into 'develop'lain
2020-05-13Add `pleroma_internal` as an internal fieldAlex Gleason
2020-05-13Merge branch 'weblate-pleroma-pleroma' into 'develop'rinpatch
2020-05-13Handle bcrypt passwords for Mastodon migrationAlex Gleason
2020-05-13Add OpenAPI spec for PleromaAPI.AccountControllerEgor Kislitsyn
2020-05-13Translated using Weblate (French)Haelwenn (lanodan) Monnier
2020-05-13Merge branch 'fix/1742-random-failing-tests' into 'develop'lain
2020-05-13Fix digest mix task on OTP releasesMichael Weiss
2020-05-13Merge branch 'openapi/suggestions' into 'develop'lain
2020-05-13Add OpenAPI spec for SuggestionControllerEgor Kislitsyn
2020-05-13Merge branch 'openapi/statuses' into 'develop'lain
2020-05-13Merge branch 'openapi/timelines' into 'develop'lain
2020-05-13ignore orderAlexander Strizhakov
2020-05-13don't use async with global mocksAlexander Strizhakov
2020-05-13don't use global mocks in setup callbacksAlexander Strizhakov
2020-05-13don't run in async if tests depend on env configAlexander Strizhakov
2020-05-13correct order for publised in assertAlexander Strizhakov
2020-05-13make test fail everytimeAlexander Strizhakov
2020-05-13don't run tests which change env in asyncAlexander Strizhakov
2020-05-13{:error, :enoent} s3 fixAlexander Strizhakov
2020-05-13Merge branch 'upgrade-comeonin' into 'develop'lain
2020-05-12Upgrade Comeonin to v5Alex Gleason
2020-05-13Fix formatEgor Kislitsyn
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-12Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.exminibikini
2020-05-13Add OpenAPI spec for StatusControllerEgor Kislitsyn