summaryrefslogtreecommitdiff
path: root/docs/config.md
AgeCommit message (Expand)Author
2019-06-03Merge branch 'develop' into feature/digest-emailMark Felder
2019-06-01Resolve merge conflictsrinpatch
2019-05-29Merge developRoman Chvanikov
2019-05-22Merge branch 'feature/mrf-user-filter' into 'develop'kaniini
2019-05-22Merge branch 'ssh-fixes' into 'develop'kaniini
2019-05-22update documentation for the new MRF features [no-ci]William Pitcock
2019-05-22[#699] add worker to clean expired oauth tokensMaksim
2019-05-22Documentation: Specify PEM format for SSH keys.lain
2019-05-21add mix task to prune the object database using a configured retention periodWilliam Pitcock
2019-05-21Add poll limits to /api/v1/instance and initial staterinpatch
2019-05-20Move default mascot configuration to `config/`Sadposter
2019-05-17Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-indexlain
2019-05-16add report uri and report toAlex S
2019-05-15Search: Add optional rum indexing / searching.lain
2019-05-13differences_in_mastoapi_responses.md: fullname & bio are optionnalAlexander Strizhakov
2019-05-08Merge developRoman Chvanikov
2019-05-07unused config paramaterAlex S
2019-05-06fix formatMaksim
2019-05-06Merge branch 'feature/bbs' into 'develop'lambda
2019-05-06Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into fea...Alexander Strizhakov
2019-05-04Merge remote-tracking branch 'origin/develop' into feature/bbslain
2019-05-01Fix syntax highlighting + clarify :frontend_configurationxse
2019-04-30Merge developRoman Chvanikov
2019-04-25Add mediaproxy whitelist capabilityMark Felder
2019-04-23Merge branch 'develop' into 'develop'kaniini
2019-04-22Add :emoji settings to config.mdilja
2019-04-22added healthcheck setting to instance configAlex S
2019-04-21Move comments for email_notifications config to docsRoman Chvanikov
2019-04-20Remove most finmoji mentions where appropriateEkaterina Vaartis
2019-04-19typo fixAlexander Strizhakov
2019-04-16Merge branch 'feature/788-separate-email-addresses' into 'develop'kaniini
2019-04-16add extra_cookie_attrs option to configHakurei Reimu
2019-04-13Merge develop to 788-separate-email-addressesAlex S
2019-04-10adding notify_email setting for trigger emailsAlex S
2019-04-10s/Pleroma.Mailer/Pleroma.Emails.Mailer/Haelwenn (lanodan) Monnier
2019-04-08Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpushEgor Kislitsyn
2019-04-08Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'lambda
2019-04-08Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpushEgor Kislitsyn
2019-04-08[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_o...Ivan Tashkinov
2019-04-08Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'lambda
2019-04-07[#923] Removed <br> elements from auth forms, adjusted docs, minor auth setti...Ivan Tashkinov
2019-04-06Add scheduler for sending scheduled activities to the queueeugenijm
2019-04-06Added limits and media attachments for scheduled activities.eugenijm
2019-04-05Use PleromaJobQueue in Pleroma.Web.PushEgor Kislitsyn
2019-04-05[#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme.Ivan Tashkinov
2019-04-04Add ability to ship logs to a Slack channelfeld
2019-04-04Improve Transmogrifier.upgrade_user_from_ap_id/2Egor Kislitsyn
2019-04-01Make only important note bold rather than the whole paragraph because it look...rinpatch
2019-04-01Remove outdated howto change config and port and move it to config.md insteadrinpatch
2019-03-31BBS: Add documentation.lain