summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-02-11deps: update fast_html to 1.0.3floki-fast_html-2-electric-boogalorinpatch
2020-02-11Revert "Merge branch 'revert-3fee859b' into 'develop'"rinpatch
2020-02-11Merge branch 'revert-3fee859b' into 'develop'lain
2020-02-11Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"feld
2020-02-11Merge branch 'feat/floki-fasthtml' into 'develop'lain
2020-02-11Make Floki use fast_htmlrinpatch
2020-02-11deps: update fast_sanitize to 0.1.7rinpatch
2020-02-11deps: update floki to 0.25.0rinpatch
2020-02-11Merge branch 'uguu-uwu-notices-bulge' into 'develop'lain
2020-02-11Update frontendlain
2020-02-11Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulgelain
2020-02-11Merge branch 'doc/unlisted-search' into 'develop'lain
2020-02-11Merge branch 'oban-crontab-fix' into 'develop'lain
2020-02-11set oban crontab to false in testsAlexander Strizhakov
2020-02-11Merge branch 'docs/kyclos' into 'develop'lain
2020-02-11clients.md: Add KyclosHaelwenn (lanodan) Monnier
2020-02-11differences_in_mastoapi_responses.md: Add note about unlisted resultsHaelwenn (lanodan) Monnier
2020-02-11Merge branch 'issue/1383' into 'develop'rinpatch
2020-02-10Merge branch 'docs_backup_restore' into 'develop'Haelwenn
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