summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-05-18ActivityPub.Utils: Use system time instead of os time for timestampsuse-system-timelain
2020-05-18Merge branch 'copyright' into 'develop'lain
2020-05-18copyright updateAlexander Strizhakov
2020-05-18Merge branch '1778-benchmark-fix' into 'develop'lain
2020-05-18Merge branch 'docs/storing-remote-media' into 'develop'lain
2020-05-18Load Testing: adjust to new CommonAPI.post format.lain
2020-05-18Merge branch 'show-media-endpoint-fixes' into 'develop'lain
2020-05-18Merge branch '1763-password-updates' into 'develop'rinpatch
2020-05-18MediaController: enforced owner-only access in :show action.Ivan Tashkinov
2020-05-17Pleroma Authenticator: Also update passwords here.lain
2020-05-17AuthenticationPlug: Also update crypt passwords.lain
2020-05-17Authentication Plug: Update bcrypt password on login.lain
2020-05-17Merge branch 'weblate-pleroma-pleroma' into 'develop'lain
2020-05-17Translated using Weblate (Polish)Jędrzej Tomaszewski
2020-05-17Added translation using Weblate (Dutch)Fristi
2020-05-17Merge branch 'feature/remove-settings-that-shouldnt-be-altered' into 'develop'lain
2020-05-17Merge branch 'pleroma-fe-2020-05-13-with-relationships-support' into 'develop'lain
2020-05-17Merge branch 'restricted-relations-embedding' into 'develop'lain
2020-05-17MediaController OAuth scope assignments fix.Ivan Tashkinov
2020-05-16Remove description of the settings that should't be alteredAngelina Filippova
2020-05-16Merge branch 'features/mastoapi_v2_media' into 'develop'lain
2020-05-16Merge branch '1757-fix-unblocks-too' into 'develop'rinpatch
2020-05-16CommonAPI: Unblock a user even if we don't have an activity.lain
2020-05-15Merge branch 'chore/update-fe-settings-and-docs' into 'develop'lain
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-14Do not require `description` in `update` actionEgor Kislitsyn
2020-05-14Fix OpenAPI specEgor Kislitsyn
2020-05-14Add Changelog entryStephanie Wilde-Hobbs
2020-05-14Allow whitelisting whole groupsStephanie Wilde-Hobbs
2020-05-14Style fixesSteph
2020-05-14Add OpenAPISpex for MediaControllerHaelwenn (lanodan) Monnier
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 docs/configuration/storing_remote_media.mdlain
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-14MastodonAPI: /api/v2/media endpointsHaelwenn (lanodan) Monnier