summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-02-18Merge branch 'fix/status-view/expires_at' into 'develop'lain
2020-02-18Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config...Ivan Tashkinov
2020-02-18Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-feder...Ivan Tashkinov
2020-02-18Merge branch 'chore/standardize-mrf-behavior' into 'develop'lain
2020-02-18Merge branch 'need-reboot-flag' into 'develop'lain
2020-02-18Add a testEgor Kislitsyn
2020-02-18Merge branch 'chore/floki-update' into 'develop'lain
2020-02-18Fix `status.expires_at` typeEgor Kislitsyn
2020-02-17Merge branch 'update/admin-fe-20200217' into 'develop'feld
2020-02-17Update adminFE buildMark Felder
2020-02-17Merge branch 'develop' into chore/floki-updateMark Felder
2020-02-17Merge branch 'upgrade_crypto' into 'develop'rinpatch
2020-02-17Update plug_cryptolain
2020-02-17Merge branch 'feat/git-attributes-elixir' into 'develop'rinpatch
2020-02-17.gitattributes: use native support for elixir definitionsrinpatch
2020-02-16Use floki's new APIs for parsing fragmentsrinpatch
2020-02-15[#1505] Restricted max thread distance for fetching replies on incoming feder...Ivan Tashkinov
2020-02-15Merge branch 'bugfix/link-preview-site_name' into 'develop'lain
2020-02-15MastodonAPI.StatusView: Do not use site_nameHaelwenn (lanodan) Monnier
2020-02-14Merge branch 'chores/deps-to-hexpm' into 'develop'rinpatch
2020-02-14Update all dependenciesHaelwenn (lanodan) Monnier
2020-02-14mix.exs: Move ex_syslogger and recon to hexpmHaelwenn (lanodan) Monnier
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
generated by cgit v1.2.3 (git 2.44.0) at 2024-05-05 09:15:41 +0000