aboutsummaryrefslogtreecommitdiff
path: root/config
AgeCommit message (Collapse)Author
2021-12-15Merge remote-tracking branch 'origin/develop' into live-dashboardAlex Gleason
2021-12-15Add Phoenix LiveDashboardAlex Gleason
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
2021-12-06Merge branch 'benchmark' into 'develop'lain
Fix benchmarks See merge request pleroma/pleroma!3551
2021-12-03Fix benchmarksAlex Gleason
2021-11-15Merge branch 'block-behavior' into 'develop'lain
Configurable block visibility, fixes #2123 Closes #2123 See merge request pleroma/pleroma!3242
2021-09-07Merge branch 'remove/mastofe' into 'develop'Haelwenn
Remove MastoFE from Pleroma, fixes #2625 Closes #2625 See merge request pleroma/pleroma!3392
2021-08-13Merge branch 'dkuku-develop-patch-66061' into 'develop'rinpatch
Update dev.exs error message to write to stderr. See merge request pleroma/pleroma!3492
2021-08-09Merge branch 'poll-notification' into 'develop'Haelwenn
MastodonAPI: Support poll notification See merge request pleroma/pleroma!3484
2021-08-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofeSean King
2021-08-06Quarantine placeholdersIlja
* kePlaceholder and valuePlaceholder of quarantined_instances where in wrong case, should be snake_case * The mrf simple and transparency exclusion were already OK
2021-08-06Add key- and valuePlaceholders for quarantined_instances and mrf_simpleIlja
* I also added for keywordpolicy as well now. It was done in the admin-fe, but is better to be done here * I also added comments to explain why we did the _info keys (backwards compatibility)
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 ↵Daniel
message at the beginnig of the file when using vim-autoformat with mix format
2021-07-27Merge remote-tracking branch 'pleroma/develop' into errorview-json-fixAlex Gleason
2021-07-27Add activity+json to Phoenix :format_encodersAlex Gleason
Fixes ErrorView rendering
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
Rename the non-federating Chat feature to Shout See merge request pleroma/pleroma!2842
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
Put Plugs in runtime mode in :dev, :test to speed up recompilation See merge request pleroma/pleroma!3411
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-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
Remove sensitive setting #nsfw See merge request pleroma/pleroma!3223
2021-03-02Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
feature/object-hashtags-rework
2021-02-27Remove sensitive-property setting #nsfw, create HashtagPolicyHaelwenn (lanodan) Monnier
2021-02-23Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
feature/object-hashtags-rework # Conflicts: # lib/pleroma/application.ex # lib/pleroma/config.ex
2021-02-23[#3213] Misc. tweaks: proper upsert in Hashtag, better feature toggle ↵Ivan Tashkinov
management.
2021-02-22Apply i1t's suggestion(s) to 1 file(s)Ivan Tashkinov
2021-02-19Avoid unnecessary 500ms sleeps from CommonAPI.follow when the target user is ↵Mark Felder
remote
2021-02-18[#3213] HashtagsTableMigrator: fault rate allowance to enable the feature ↵Ivan Tashkinov
(defaults to 1%), counting of affected objects, misc. tweaks.
2021-02-17Remove `:auth, :enforce_oauth_admin_scope_usage`rinpatch
`admin` scope has been required by default for more than a year now and all apps that use the API seems to request a proper scope by now.
2021-02-13[#3213] `rescue` around potentially-raising `Repo.insert_all/_` calls. Misc. ↵Ivan Tashkinov
improvements (docs etc.).
2021-02-11Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
feature/object-hashtags-rework # Conflicts: # CHANGELOG.md # lib/mix/tasks/pleroma/database.ex # lib/pleroma/web/templates/feed/feed/_activity.rss.eex
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 07:50:06 +0000