aboutsummaryrefslogtreecommitdiff
path: root/config
AgeCommit message (Expand)Author
2019-03-15Merge branch 'feature/openldap-support' into 'develop'kaniini
2019-03-15Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauthIvan Tashkinov
2019-03-15[#923] OAuth: prototype of sign in / sign up with Twitter.Ivan Tashkinov
2019-03-15Enable dedupe by defaultrinpatch
2019-03-14Add some testsrinpatch
2019-03-14Merge remote-tracking branch 'upstream/develop' into feature/openldap-supportlink0ff
2019-03-12Support LDAP method start_tlslink0ff
2019-03-11Sign in via Twitter (WIP).Ivan Tashkinov
2019-03-08Merge branch 'fix-tlsv1.3' into 'develop'kaniini
2019-03-08Fetch user's outbox posts on first federation with that userEkaterina Vaartis
2019-03-06[#647] tests for web pushMaksim
2019-03-06Add default config for masto_feHaelwenn (lanodan) Monnier
2019-03-04allow users to disable their own accountEgor Kislitsyn
2019-03-04Fix supported TLS versions as TLS 1.3 support seems buggy.KokaKiwi
2019-03-03Merge remote-tracking branch 'upstream/develop' into feature/openldap-supportlink0ff
2019-02-28config: fix chat endpoint pathWilliam Pitcock
2019-02-28config: update config for cowboy 2 endpointsWilliam Pitcock
2019-02-26AutoLinkerEgor
2019-02-22OpenLDAP supportlink0ff
2019-02-20ReportsEgor
2019-02-18Merge branch 'feature/jobs' into 'develop'kaniini
2019-02-16Add optional welcome message.lain
2019-02-15Add tests, change default config values, fix a bugKaren Konou
2019-02-12config/dev.exs: Don’t put secure cookies on devHaelwenn (lanodan) Monnier
2019-02-11Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobsEgor Kislitsyn
2019-02-08Merge branch 'develop' into feature/keyword-policyrinpatch
2019-02-08rename ftl_removal to federated_timeline_removal to keep consistent naming wi...rinpatch
2019-02-08Add default config for keyword policyrinpatch
2019-02-06rids the duplicate timestamp from default ExSyslogger configMichael Loftis
2019-02-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobsEgor Kislitsyn
2019-02-04Merge branch 'feature/hellthread-filter-improvements' into 'develop'rinpatch
2019-02-03added optional delist featureKaren Konou
2019-02-03Unbreak all the tests.lain
2019-02-01Merge branch '534_federation_targets_reachability' into 'develop'href
2019-01-31Make rich media support toggleablerinpatch
2019-01-31Merge remote-tracking branch 'MAIN/develop' into feature/jobsEgor Kislitsyn
2019-01-30Use multiple hackney poolshref
2019-01-29Merge branch 'hj-happiness-improvement' into 'develop'kaniini
2019-01-28add a job queueEgor Kislitsyn
2019-01-28[#534] Merged `upstream/develop`.Ivan Tashkinov
2019-01-28[#534] Various tweaks. Tests for Instances and Instance.Ivan Tashkinov
2019-01-28Change default bg image in new config.lain
2019-01-25[#534] Configurable outgoing federation reachability timeout.Ivan Tashkinov
2019-01-23New frontend configuration mechanism.lain
2019-01-18Fix merge conflictrinpatch
2019-01-18unfurl_nsfw: false by defaultrinpatch
2019-01-17Also add to default configMark Felder
2019-01-16oopsrinpatch
2019-01-15Introduce get_by_id in Activity, replace newlines with spacesrinpatch
2019-01-13Resolve merge conflictrinpatch