Commit Graph

86 Commits (eff725c3af4537b2d993f85a236636cd5d5e17d0)

Author SHA1 Message Date
Alexander Strizhakov ada384207b typo fix
6 years ago
kaniini 73df3046e0 Merge branch 'feature/788-separate-email-addresses' into 'develop'
6 years ago
Hakurei Reimu 10096bbf2b add extra_cookie_attrs option to config
6 years ago
Alex S c349573791 Merge develop to 788-separate-email-addresses
6 years ago
Alex S fe13a1d78c adding notify_email setting for trigger emails
6 years ago
Haelwenn (lanodan) Monnier 1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
6 years ago
Egor Kislitsyn 9abf832b03 Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
lambda e19590c93f Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
6 years ago
Egor Kislitsyn c3d5c3513a Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
Ivan Tashkinov bffddf5e31 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
lambda b4da2bc1d0 Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
6 years ago
Ivan Tashkinov e3328bc138 [#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.
6 years ago
eugenijm 2056efa714 Add scheduler for sending scheduled activities to the queue
6 years ago
eugenijm fc92a0fd8d Added limits and media attachments for scheduled activities.
6 years ago
Egor Kislitsyn f1712cd2f1 Use PleromaJobQueue in Pleroma.Web.Push
6 years ago
Ivan Tashkinov 47a236f753 [#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
6 years ago
feld 3b12eeda19 Add ability to ship logs to a Slack channel
6 years ago
Egor Kislitsyn cfa6e7289f Improve Transmogrifier.upgrade_user_from_ap_id/2
6 years ago
rinpatch e2b94d8f33 Make only important note bold rather than the whole paragraph because it looks better that way
6 years ago
rinpatch a309b49c2d Remove outdated howto change config and port and move it to config.md instead
6 years ago
rinpatch afbc905a1c qs
6 years ago
rinpatch 11584488d1 Improve PleromaJobQeue config documentation
6 years ago
Egor 9a39d1d846 Replace Pleroma.Jobs with `pleroma_job_queue`
6 years ago
kaniini 1c3d3d0c2b Merge branch 'safe-mentions' into 'develop'
6 years ago
Quentin Rameau 80bc9ed2ba Add a gopher url port config option
6 years ago
lain 8468f3f6d4 Add safe dm mode option.
6 years ago
kaniini 8b352af4dd Merge branch 'feature/openldap-support' into 'develop'
6 years ago
rinpatch e2fe796c63 Add some tests
6 years ago
link0ff 54e7087ab4 Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
6 years ago
link0ff 9338f061a3 Support LDAP method start_tls
6 years ago
Ekaterina Vaartis 5021b7836f Fetch user's outbox posts on first federation with that user
6 years ago
Haelwenn (lanodan) Monnier a283a1fcd0
Add default config for masto_fe
6 years ago
link0ff 88a672fe88 Move LDAP code to LDAPAuthenticator. Use Authenticator for token_exchange with grant_type as well
6 years ago
link0ff 19e2b85247 Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
6 years ago
Egor c3ac9424d2 AutoLinker
6 years ago
link0ff e278d47023 OpenLDAP support
6 years ago
Egor bff9eb5ef7 Reports
6 years ago
kaniini 833161b5d2 Merge branch 'feature/jobs' into 'develop'
6 years ago
lain 27375e5575 WelcomeMessage: specify that the user has to be local.
6 years ago
lain d812a347ca Add optional welcome message.
6 years ago
Egor Kislitsyn 305d219413 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
6 years ago
rinpatch 9a23f8f3ea Add tests and fix a typo in docs
6 years ago
rinpatch 38ff9b3568 fix typo in config.md
6 years ago
rinpatch 6c21f5aa16 Merge branch 'develop' into feature/keyword-policy
6 years ago
rinpatch 8a0b755c19 rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy
6 years ago
rinpatch 46aa8c18a2 Add keyword policy
6 years ago
Michael Loftis ab80c8ebb8 adds a couple of explicit examples for ExSyslogger
6 years ago
Egor Kislitsyn 3a3a3996b7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
6 years ago
rinpatch 89762ad230 Merge branch 'feature/hellthread-filter-improvements' into 'develop'
6 years ago
Karen Konou e10cda7541 implemented tweaks
6 years ago