6ef145b4fc
Merge branch 'develop' into feature/digest-email
5 years ago
080e1aa70e
add option skip_thread_containment
5 years ago
83663caa81
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification.
5 years ago
c724d8df98
docs: document mrf_subchain
5 years ago
65db5e9f52
Resolve merge conflicts
5 years ago
ce47017c89
Merge develop
5 years ago
75e78d4e23
Merge branch 'feature/mrf-user-filter' into 'develop'
...
mrf: add support for filtering users
See merge request pleroma/pleroma!1188
5 years ago
f0516d9114
Merge branch 'ssh-fixes' into 'develop'
...
Ssh fixes
Closes #869 and #925
See merge request pleroma/pleroma!1191
5 years ago
7d9b33b3ce
update documentation for the new MRF features [no-ci]
5 years ago
620908a2db
[ #699 ] add worker to clean expired oauth tokens
5 years ago
b22145cbc4
Documentation: Specify PEM format for SSH keys.
...
Otherwise openssh-client 7.9 will generate a different format that can't be used
by esshd.
5 years ago
16b260fb19
add mix task to prune the object database using a configured retention period
5 years ago
76a7429bef
Add poll limits to /api/v1/instance and initial state
5 years ago
daeae8e2e7
Move default mascot configuration to `config/`
5 years ago
412a3d8a0f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
5 years ago
aa11fa4864
add report uri and report to
5 years ago
f1e67bdc31
Search: Add optional rum indexing / searching.
5 years ago
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
5 years ago
b6b5b16ba4
Merge develop
5 years ago
f46295faa7
unused config paramater
5 years ago
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
5 years ago
aacac9da0b
Merge branch 'feature/bbs' into 'develop'
...
BBS / SSH
See merge request pleroma/pleroma!997
5 years ago
ce6ca0fefe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
5 years ago
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
5 years ago
2982061dfa
Fix syntax highlighting + clarify :frontend_configuration
5 years ago
0f0cc2703b
Merge develop
5 years ago
24c3e2db2c
Add mediaproxy whitelist capability
5 years ago
7dcac0bac0
Merge branch 'develop' into 'develop'
...
Add shortcode_globs setting to documentation
See merge request pleroma/pleroma!1087
5 years ago
74ef14b04e
Add :emoji settings to config.md
5 years ago
d35246c449
added healthcheck setting to instance config
5 years ago
b87ad13803
Move comments for email_notifications config to docs
5 years ago
8f93d4c423
Remove most finmoji mentions where appropriate
6 years ago
ada384207b
typo fix
...
docs for RelMe provider
6 years ago
73df3046e0
Merge branch 'feature/788-separate-email-addresses' into 'develop'
...
Feature/788 separate email addresses
Closes #788
See merge request pleroma/pleroma!1040
6 years ago
10096bbf2b
add extra_cookie_attrs option to config
...
Allow instance admins to set their own SameSite cookie policy from
the config. Default value in the config is `Lax`.
6 years ago
c349573791
Merge develop to 788-separate-email-addresses
...
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
6 years ago
fe13a1d78c
adding notify_email setting for trigger emails
6 years ago
1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
6 years ago
9abf832b03
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
e19590c93f
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
...
Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019
6 years ago
c3d5c3513a
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
bffddf5e31
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# docs/config.md
# test/support/factory.ex
6 years ago
b4da2bc1d0
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
...
# Conflicts:
# config/config.exs
# docs/config.md
6 years ago
e3328bc138
[ #923 ] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.
6 years ago
2056efa714
Add scheduler for sending scheduled activities to the queue
6 years ago
fc92a0fd8d
Added limits and media attachments for scheduled activities.
6 years ago
f1712cd2f1
Use PleromaJobQueue in Pleroma.Web.Push
6 years ago
47a236f753
[ #923 ] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
6 years ago
3b12eeda19
Add ability to ship logs to a Slack channel
6 years ago
cfa6e7289f
Improve Transmogrifier.upgrade_user_from_ap_id/2
6 years ago
e2b94d8f33
Make only important note bold rather than the whole paragraph because it looks better that way
6 years ago
a309b49c2d
Remove outdated howto change config and port and move it to config.md instead
6 years ago
3fc4ea45df
BBS: Add documentation.
6 years ago
afbc905a1c
qs
6 years ago
11584488d1
Improve PleromaJobQeue config documentation
6 years ago
9a39d1d846
Replace Pleroma.Jobs with `pleroma_job_queue`
6 years ago
1c3d3d0c2b
Merge branch 'safe-mentions' into 'develop'
...
Add safe dm mode option.
See merge request pleroma/pleroma!958
6 years ago
80bc9ed2ba
Add a gopher url port config option
...
This lets the user advertise a different port in the gopher urls,
for example listening locally on port 7070 but telling clients to
connect to the regular port 70.
6 years ago
8468f3f6d4
Add safe dm mode option.
6 years ago
8b352af4dd
Merge branch 'feature/openldap-support' into 'develop'
...
OpenLDAP support
Closes #203
See merge request pleroma/pleroma!859
6 years ago
e2fe796c63
Add some tests
6 years ago
54e7087ab4
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
6 years ago
9338f061a3
Support LDAP method start_tls
6 years ago
5021b7836f
Fetch user's outbox posts on first federation with that user
6 years ago
a283a1fcd0
Add default config for masto_fe
...
Related to: https://git.pleroma.social/pleroma/mastofe/merge_requests/22
6 years ago
88a672fe88
Move LDAP code to LDAPAuthenticator. Use Authenticator for token_exchange with grant_type as well
6 years ago
19e2b85247
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
6 years ago
c3ac9424d2
AutoLinker
6 years ago
e278d47023
OpenLDAP support
6 years ago
bff9eb5ef7
Reports
6 years ago
833161b5d2
Merge branch 'feature/jobs' into 'develop'
...
Job Queue
See merge request pleroma/pleroma!732
6 years ago
27375e5575
WelcomeMessage: specify that the user has to be local.
6 years ago
d812a347ca
Add optional welcome message.
6 years ago
305d219413
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/federator/federator.ex
# lib/pleroma/web/websub/websub.ex
6 years ago
9a23f8f3ea
Add tests and fix a typo in docs
6 years ago
38ff9b3568
fix typo in config.md
6 years ago
6c21f5aa16
Merge branch 'develop' into feature/keyword-policy
6 years ago
8a0b755c19
rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy
6 years ago
46aa8c18a2
Add keyword policy
6 years ago
ab80c8ebb8
adds a couple of explicit examples for ExSyslogger
6 years ago
3a3a3996b7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/federator/federator.ex
6 years ago
89762ad230
Merge branch 'feature/hellthread-filter-improvements' into 'develop'
...
Improve hellthread filter
Closes #584
See merge request pleroma/pleroma!766
6 years ago
e10cda7541
implemented tweaks
6 years ago
10130fa7d6
made toggleable, added docs
6 years ago
0c08bd4181
Update Mogrify docs and warning for deprecated syntax to encourage
...
users to enable both strip and auto-orient
6 years ago
b3b0855456
Merge branch '534_federation_targets_reachability' into 'develop'
...
[#534 ] Unreachable federation targets retirement
Closes #534
See merge request pleroma/pleroma!703
6 years ago
dea33f4aec
Merge branch 'develop' into 'develop'
...
Clarify the description of the `logo_mask` configuration key.
See merge request pleroma/pleroma!747
6 years ago
7057891db6
Make rich media support toggleable
6 years ago
a0dc95d084
Clarify the description of the `logo_mask` configuration key.
6 years ago
d3677d2b4d
Merge remote-tracking branch 'MAIN/develop' into feature/jobs
6 years ago
bd5086731e
Merge branch 'multiple-hackney-pools' into 'develop'
...
Use multiple hackney pools
See merge request pleroma/pleroma!739
6 years ago
4aff4efa8d
Use multiple hackney pools
...
* federation (ap, salmon)
* media (rich media, media proxy)
* upload (uploader proxy)
Each "part" will stop fighting others ones -- a huge federation outbound
could before make the media proxy fail to checkout a connection in time.
splitted media and uploaded media for the good reason than an upload
pool will have all connections to the same host (the uploader upstream).
it also has a longer default retention period for connections.
6 years ago
7db517ff06
docs/config.md: Fix syntax, pleroma_fe isn’t an atom
6 years ago
aa492af6c2
docs/config.md: Fix typo, provide an example key with camelCase and where to find more
...
[ci skip]
6 years ago
d03a116654
Merge branch 'hj-happiness-improvement' into 'develop'
...
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
6 years ago
55affbca7f
add a job queue
6 years ago
d3f9e6f6fe
[ #534 ] Merged `upstream/develop`.
6 years ago
bcc559e4e6
Update config.md
6 years ago
656ed7c84a
[ #534 ] Configurable outgoing federation reachability timeout.
6 years ago
e221c681dc
New frontend configuration mechanism.
6 years ago
Mark Felder