aboutsummaryrefslogtreecommitdiff
path: root/config
AgeCommit message (Collapse)Author
2019-04-02refactoring of emoji tags config to use groupsAlex S
2019-04-01Adding tag to emoji ets tableAlex S
changes in apis
2019-04-01[#923] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
twitter_oauth # Conflicts: # mix.exs
2019-03-31Add default mail adapter settings to configMark Felder
2019-03-31BBS: Tests and formatting.lain
2019-03-29Replace Pleroma.Jobs with `pleroma_job_queue`Egor
2019-03-27Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauthIvan Tashkinov
2019-03-27[#923] OAuth consumer improvements, fixes, refactoring.Ivan Tashkinov
2019-03-22Merge branch 'safe-mentions' into 'develop'kaniini
Add safe dm mode option. See merge request pleroma/pleroma!958
2019-03-20Add safe dm mode option.lain
2019-03-20[#923] Typo fix.Ivan Tashkinov
2019-03-20[#923] Support for multiple OAuth consumer strategies.Ivan Tashkinov
2019-03-20Ecto 3.0.5 migrationrinpatch
kms
2019-03-18[#923] Support for multiple (external) registrations per user via Registration.Ivan Tashkinov
2019-03-18[#923] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
twitter_oauth # Conflicts: # config/config.exs # lib/pleroma/web/auth/pleroma_authenticator.ex
2019-03-15Merge branch 'feature/openldap-support' into 'develop'kaniini
OpenLDAP support Closes #203 See merge request pleroma/pleroma!859
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
Fix supported TLS versions as TLS 1.3 support seems buggy. Closes #708 See merge request pleroma/pleroma!892
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
Related to: https://git.pleroma.social/pleroma/mastofe/merge_requests/22
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
Job Queue See merge request pleroma/pleroma!732
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
# Conflicts: # lib/pleroma/web/federator/federator.ex # lib/pleroma/web/websub/websub.ex
2019-02-08Merge branch 'develop' into feature/keyword-policyrinpatch
2019-02-08rename ftl_removal to federated_timeline_removal to keep consistent naming ↵rinpatch
with SimplePolicy
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
# Conflicts: # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/federator/federator.ex
2019-02-04Merge branch 'feature/hellthread-filter-improvements' into 'develop'rinpatch
Improve hellthread filter Closes #584 See merge request pleroma/pleroma!766
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
[#534] Unreachable federation targets retirement Closes #534 See merge request pleroma/pleroma!703
2019-01-31Make rich media support toggleablerinpatch
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-23 20:40:52 +0000