aboutsummaryrefslogtreecommitdiff
path: root/config
AgeCommit message (Collapse)Author
2019-11-21Revert "Merge branch 'patch-1' into 'develop'"rinpatch
This reverts merge request !1829
2019-11-20Some tasks try to set log level in test environment, but we were stripping ↵Mark Felder
logs belog :warn. Ensure console backend logs in test environment are :warn, but mix tasks run in test env do not run with :debug because it's far too verbose.
2019-11-20Console backend's log format should be prefixed and suffixed with newlines.Mark Felder
This is how upstream does it by default.
2019-11-20Be specific about format for logs in test as we have tests that check itMark Felder
2019-11-19Allow test builds to have info and debug logs strippedMark Felder
2019-11-19Allow mix tasks to always run with debug loggingMark Felder
2019-11-14config: add configuration for MRF ObjectAgePolicyAriadne Conill
2019-11-11Merge branch 'feature/static-fe' into 'develop'kaniini
Static frontend See merge request pleroma/pleroma!1917
2019-11-11Default config: Use extended nickname formatlain
2019-11-10Disable attachment links by defaultrinpatch
Closes #1394
2019-11-10Apply suggestion to config/config.exslain
2019-11-10Apply suggestion to config/config.exslain
2019-11-10add subject to atom feedMaksim Pechnikov
2019-11-09Move static_fe config to its own section instead of in :instance.Phil Hagelberg
2019-11-08Bump fast_sanitize to 0.1.1rinpatch
The parser C-Node has been completely rewritten to not use the deprecated `erl_interface` api. Closes #1378 since Nodex was ripped out and the replacement randomizes master node name.
2019-10-29Blacklist myhtmlex nodes from swarmrinpatch
2019-10-29Use the default scrubber before mediaproxy transformationrinpatch
2019-10-19MastoFE: Add PWA manifest.KokaKiwi
2019-10-18Merge branch 'patch-1' into 'develop'rinpatch
Fix a typo in default static directory configuration for OTP releases Closes #1289 See merge request pleroma/pleroma!1829
2019-10-18config: disable Websub and Salmon publisher modulesAriadne Conill
2019-10-10Fix https://git.pleroma.social/pleroma/pleroma/issues/1289yalh76
2019-10-10Benchmark config: Don't use the sql sandbox.lain
2019-10-10Benchmark config: Database adjustments.lain
2019-10-10Merge remote-tracking branch 'origin/develop' into benchmark-finishinglain
2019-10-10Gitlab: Run benchmark in CI.lain
2019-10-07Extract RSS Feed functionality from OStatusSergey Suprunenko
2019-10-06Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1260-rate-limited-auth-actions # Conflicts: # CHANGELOG.md
2019-10-03Add missing extended_nickname_format setting to the default configMark Felder
2019-09-30[#1260] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1260-rate-limited-auth-actions # Conflicts: # CHANGELOG.md
2019-09-27Add `remote_ip` plugminibikini
2019-09-23Merge branch 'support-rel-ugc' into 'develop'kaniini
Add support for `rel="ugc"` Closes #1255 See merge request pleroma/pleroma!1679
2019-09-23add tunable for stream uploads, as needed for jortage to work.Rachel Fae Fox
2019-09-19Update "config/description.exs"Egor Kislitsyn
2019-09-19Add support for `rel="ugc"`Egor Kislitsyn
2019-09-19Add :shared_pack_cache_seconds_per_file to description.exsEkaterina Vaartis
2019-09-19Add caching for emoji pack sharingEkaterina Vaartis
2019-09-19Add tests for emoji pack sharingEkaterina Vaartis
2019-09-17description.exs: uncomment type for email logoHaelwenn (lanodan) Monnier
2019-09-17description.exs: remove empty strings on descriptionsHaelwenn (lanodan) Monnier
2019-09-17description.exs: remove empty strings and arraysHaelwenn (lanodan) Monnier
2019-09-17Remove [true,false] for booleans, it is implicitHaelwenn (lanodan) Monnier
2019-09-17[#1260] Rate-limiting for create authentication and related requests.Ivan Tashkinov
2019-09-16Set `account_field_value_length` limit to 2048 by defaultEgor Kislitsyn
2019-09-16Revert "Merge branch 'revert-4fabf83a' into 'develop'"Egor Kislitsyn
This reverts commit fe7fd331263007e0fb2877ef7370a09a9704da36, reversing changes made to 4fabf83ad01352442906d79187aeab4c777f4df8.
2019-09-16Revert "Merge branch 'streamer-refactoring' into 'develop'"kaniini
This reverts merge request !1653
2019-09-16Streamer refactoringSteven Fuchs
2019-09-14[#1149] Rewritten readme as config/description.exs.Ivan Tashkinov
2019-09-14[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1149-oban-job-queue # Conflicts: # docs/config.md # mix.lock
2019-09-13Merge branch 'admin-config-description' into 'develop'rinpatch
Admin config description Closes #1178 and #1209 See merge request pleroma/pleroma!1611
2019-09-11Use Jason for rendering responsesrinpatch
Although Jason readme says Phoenix 1.4+ already does it by default, [it actually does it only for new projects](https://github.com/phoenixframework/phoenix/blob/3bfb9f6e900c9a2e31cb95736e2cb5bdad329b61/lib/phoenix.ex#L58-L59)