summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-02-10DOCS Backup/Restore/Migrate your instanceIlja
2020-02-10Merge branch 'fix/compilation-error-docs' into 'develop'rinpatch
2020-02-10Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-02-10Fix a compilation error under certain circumstancesrinpatch
2020-02-09Merge branch 'fix/email-task-otp' into 'develop'rinpatch
2020-02-09Fix email mix task on OTP releasesrinpatch
2020-02-08Merge branch 'fix/upload-limit-otp' into 'develop'lain
2020-02-07Actually fix upload limit on OTP releasesrinpatch
2020-02-07Merge branch 'cancel-follow-request' into 'develop'Haelwenn
2020-02-07Merge branch 'questions-timezone' into 'develop'rinpatch
2020-02-07Questions: Add timezone to `closed` propertyLain Soykaf
2020-02-07deps: update plug to 1.9rinpatch
2020-02-07Apply suggestion to docs/API/pleroma_api.mdlain
2020-02-07Apply suggestion to docs/API/pleroma_api.mdlain
2020-02-07EmojiReactions: Remove old API endpointsLain Soykaf
2020-02-07EmojiReactions: Add docs and ChangelogLain Soykaf
2020-02-07EmojiReactions: Add Mastodon-aligned reaction endpoints, change responseLain Soykaf
2020-02-07Add User.get_follow_state/2Egor Kislitsyn
2020-02-07Merge branch 'rename_emoji_reactios' into 'develop'rinpatch
2020-02-07Merge branch 'docs-fix' into 'develop'rinpatch
2020-02-07fixAlexander Strizhakov
2020-02-06EmojiReactions: Rename to EmojiReactsLain Soykaf
2020-02-06Merge branch 'update/fe-bundle-20200206' into 'develop'rinpatch
2020-02-06Update FE bundleMark Felder
2020-02-06Merge branch 'mastoapi-non-html-strings' into 'develop'feld
2020-02-06Merge branch 'fix/dymamic-docs' into 'develop'feld
2020-02-06Merge branch 'config-changes' into 'develop'feld
2020-02-06Update CHANGELOGEgor Kislitsyn
2020-02-06Cancellation of a follow request for a remote userEgor Kislitsyn
2020-02-06Merge branch 'develop' into fix/dymamic-docsrinpatch
2020-02-06Simplify in-database config docsrinpatch
2020-02-06description changeAlexander Strizhakov
2020-02-06dropdown typeAlexander Strizhakov
2020-02-06removing confusing errorAlexander Strizhakov
2020-02-05Merge branch 'fix/unpinnable-polls' into 'develop'rinpatch
2020-02-05Merge branch 'removing-admin-api-endpoint' into 'develop'rinpatch
2020-02-05Merge branch 'remove-linker-scheme-option' into 'develop'feld
2020-02-05Apply suggestion to CHANGELOG.mdAlexander Strizhakov
2020-02-05removing migrate_from_db endpoint from admin apiAlexander Strizhakov
2020-02-05Remove AutoLinker `scheme` option from the configEgor Kislitsyn
2020-02-05Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'rinpatch
2020-02-05Add support for cancellation of a follow requestEgor Kislitsyn
2020-02-04Merge branch 'feature/make_attachments_cleanup_optional' into 'develop'lain
2020-02-04Add cheatsheet entryLain Soykaf
2020-02-03Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-02-02fix not being able to pin pollsrinpatch
2020-02-02mastodon API: do not sanitize html in non-html fieldsrinpatch
2020-01-31Make attachments cleanup optionalRoman Chvanikov
2020-01-30Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'rinpatch
2020-01-30Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhostrinpatch