aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-02-14Merge branch 'update/ferd/recon' into 'develop'Haelwenn
2020-02-14Merge branch 'fix/mrf-sample-doc' of git.pleroma.social:pleroma/pleroma into ...Mark Felder
2020-02-14Fix MRF docs further. I don't think anyone has actually tested with the old d...Mark Felder
2020-02-14Standardize @behaviour usage in MRFsMark Felder
2020-02-14Apply suggestion to docs/configuration/mrf.mdfeld
2020-02-14Update suggested path for location of your custom MRFMark Felder
2020-02-14Update ferd/recon, requested by @tk to support an AMPQ library he'sMark Felder
2020-02-13Make the sample code actually compileMark Felder
2020-02-13Tweaks to `clear_config` calls in tests in order to prevent side effects on c...Ivan Tashkinov
2020-02-13Formatting got me againMark Felder
2020-02-13Merge branch 'fix/mrf-transparency-disabling-federation-status' into 'develop'rinpatch
2020-02-13Even more description improvementsMark Felder
2020-02-13Add missing Oban job for attachments_cleanupMark Felder
2020-02-13More description cleanup workMark Felder
2020-02-13More description cleanupsMark Felder
2020-02-13Merge branch 'fix/rename-no_attachment_links-setting' into 'develop'lain
2020-02-13Merge branch 'chore/fast-sanitize-bump-back' into 'develop'rinpatch
2020-02-13NodeInfo: Fix federating status not being reported when MRFrinpatch
2020-02-13deps: update back fast sanitizerinpatch
2020-02-13Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'feld
2020-02-13Merge branch 'chore/config-descriptions' into 'develop'feld
2020-02-13Merge branch 'fix/status_expires_in_validation' into 'develop'feld
2020-02-13FormattingMark Felder
2020-02-13FormattingMark Felder
2020-02-13Update description.exsfeld
2020-02-13Apply suggestion to config/description.exsfeld
2020-02-12Fix `status.expires_in` validationEgor Kislitsyn
2020-02-11Fix the confusingly named and inverted logic of "no_attachment_links"Mark Felder
2020-02-11First round at cleaning up descriptionsMark Felder
2020-02-11Merge branch 'restore-twitter-api-tests' into 'develop'feld
2020-02-12Restore TwitterAPI testsEgor Kislitsyn
2020-02-11Merge branch 'update/admin-fe-20200211' into 'develop'feld
2020-02-11Hotlink logo instead of attachmentEgor Kislitsyn
2020-02-11Merge branch 'revert-3fee859b' into 'develop'lain
2020-02-11Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"feld
2020-02-11Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admi...Mark Felder
2020-02-11Update AdminFE buildMark Felder
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-11Merge branch 'develop' into feature/new-registrations-digestEgor Kislitsyn
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