summaryrefslogtreecommitdiff
path: root/config
AgeCommit message (Expand)Author
2022-01-12WIP account endorsementsmarcin mikołajczak
2021-12-27Merge branch 'restricted-moderators' into 'develop'Alex Gleason
2021-12-27Merge branch 'log-slow-queries' into 'develop'Alex Gleason
2021-12-27Made slow queries logging disabled by default.Ivan Tashkinov
2021-12-27Fix lint errorsAlibek Omarov
2021-12-27API: optionally restrict moderators from accessing sensitive dataAlibek Omarov
2021-12-26Configurability of slow queries logging ([:pleroma, :telemetry, :slow_queries...Ivan Tashkinov
2021-12-26MastoAPI: Profile directorymarcin mikołajczak
2021-12-15Merge remote-tracking branch 'origin/develop' into live-dashboardlive-dashboardAlex Gleason
2021-12-15Add Phoenix LiveDashboardAlex Gleason
2021-12-06Merge branch 'benchmark' into 'develop'lain
2021-12-03Fix benchmarksAlex Gleason
2021-11-15Merge branch 'block-behavior' into 'develop'lain
2021-09-07Merge branch 'remove/mastofe' into 'develop'Haelwenn
2021-08-13Merge branch 'dkuku-develop-patch-66061' into 'develop'rinpatch
2021-08-09Merge branch 'poll-notification' into 'develop'Haelwenn
2021-08-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofeSean King
2021-08-06Quarantine placeholdersIlja
2021-08-06Add key- and valuePlaceholders for quarantined_instances and mrf_simpleIlja
2021-08-06config/description.exs: Update quarantine settings to tuplesIlja
2021-07-27use puts instead warnDaniel
2021-07-27Update dev.exs error message to write to stderr. Currently it dumps this mess...Daniel
2021-07-27Merge remote-tracking branch 'pleroma/develop' into errorview-json-fixAlex Gleason
2021-07-27Add activity+json to Phoenix :format_encodersAlex Gleason
2021-07-18Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixesAlex Gleason
2021-07-17MastodonAPI: Support poll notificationAlex Gleason
2021-06-04Fix merge conflicts with upstreamSean King
2021-06-03Merge branch 'chore/rename-chat' into 'develop'Haelwenn
2021-06-02Update wording for relays in docs and config descriptionMark Felder
2021-06-02FormattingMark Felder
2021-06-01disableChat / disableShout didn't actually do anything for PleromaFEMark Felder
2021-06-01Update description file for new shout config setting locationMark Felder
2021-06-01Move shout configuration from :instance, update docs and changelogMark Felder
2021-06-01Update PleromaFE settings for the old chat boxMark Felder
2021-06-01Just call it shoutMark Felder
2021-06-01Rename the non-federating Chat feature to ShoutMark Felder
2021-05-29Adding descriptionSnow
2021-05-28Merge branch 'plug-runtime-dev' into 'develop'feld
2021-05-20Switch from the deprecated "use Mix.config" to "import Config"Mark Felder
2021-05-19Merge remote-tracking branch 'pleroma/develop' into plug-runtime-devAlex Gleason
2021-05-19Put Plugs in runtime mode in :dev, :test to speed up recompilationAlex Gleason
2021-05-16Merge remote-tracking branch 'pleroma/develop' into optional-configAlex Gleason
2021-05-16Make prod.secret.exs optional (with warning)Alex Gleason
2021-04-29Merge remote-tracking branch 'upstream/develop' into block-behaviorblock-behaviorAlex Gleason
2021-04-15Remove MastoFE configuration stuffSean King
2021-03-30Support for configuration via AdminFEMark Felder
2021-03-30Upstream original followbot implementationMark Felder
2021-03-19Merge branch 'fix/remove_auto_nsfw' into 'develop'rinpatch
2021-03-02Merge remote-tracking branch 'remotes/origin/develop' into feature/object-has...Ivan Tashkinov
2021-02-27Remove sensitive-property setting #nsfw, create HashtagPolicyHaelwenn (lanodan) Monnier