Alexander Strizhakov
|
c2ca1f22a2
|
it is changed in compile time
we can't change module attributes and endpoint settings in runtime
|
5 years ago |
|
lain
|
4265608097
|
Merge branch 'chore/tagpolicy_docs' into 'develop'
Document TagPolicy in `rewrite_policy` section
See merge request pleroma/pleroma!1271
|
5 years ago |
|
rinpatch
|
ced59be1ae
|
Document TagPolicy in `rewrite_policy` section
|
5 years ago |
|
Egor Kislitsyn
|
6f29865d43
|
Add option to restrict all users to local content
|
5 years ago |
|
Egor Kislitsyn
|
ad04d12de6
|
Replace `MastodonAPIController.account_register/2` rate limiter
|
5 years ago |
|
Egor Kislitsyn
|
2e5affce61
|
Add RateLimiter
|
5 years ago |
|
Egor
|
f82382de22
|
[#943] Make the unauthenticated users limitation optional
|
5 years ago |
|
Ivan Tashkinov
|
3eefb274f4
|
OAuth consumer: tests fix, comments, Keycloak config notes.
|
5 years ago |
|
Maksim Pechnikov
|
4f2e359687
|
Merge branch 'develop' into issue/941
|
5 years ago |
|
kaniini
|
9f0d0d0805
|
Merge branch 'feature/mrf-subchain' into 'develop'
MRF: subchain policy
See merge request pleroma/pleroma!1233
|
5 years ago |
|
kaniini
|
a536f515dd
|
Merge branch 'ueberauth_config_extension' into 'develop'
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification
See merge request pleroma/pleroma!1234
|
5 years ago |
|
Maksim Pechnikov
|
080e1aa70e
|
add option skip_thread_containment
|
5 years ago |
|
Ivan Tashkinov
|
83663caa81
|
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification.
|
5 years ago |
|
William Pitcock
|
c724d8df98
|
docs: document mrf_subchain
|
5 years ago |
|
rinpatch
|
65db5e9f52
|
Resolve merge conflicts
|
5 years ago |
|
kaniini
|
75e78d4e23
|
Merge branch 'feature/mrf-user-filter' into 'develop'
mrf: add support for filtering users
See merge request pleroma/pleroma!1188
|
5 years ago |
|
kaniini
|
f0516d9114
|
Merge branch 'ssh-fixes' into 'develop'
Ssh fixes
Closes #869 and #925
See merge request pleroma/pleroma!1191
|
5 years ago |
|
William Pitcock
|
7d9b33b3ce
|
update documentation for the new MRF features [no-ci]
|
5 years ago |
|
Maksim
|
620908a2db
|
[#699] add worker to clean expired oauth tokens
|
5 years ago |
|
lain
|
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 |
|
William Pitcock
|
16b260fb19
|
add mix task to prune the object database using a configured retention period
|
5 years ago |
|
rinpatch
|
76a7429bef
|
Add poll limits to /api/v1/instance and initial state
|
5 years ago |
|
Sadposter
|
daeae8e2e7
|
Move default mascot configuration to `config/`
|
5 years ago |
|
lain
|
412a3d8a0f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
|
5 years ago |
|
Alex S
|
aa11fa4864
|
add report uri and report to
|
5 years ago |
|
lain
|
f1e67bdc31
|
Search: Add optional rum indexing / searching.
|
5 years ago |
|
Alexander Strizhakov
|
a2be420f94
|
differences_in_mastoapi_responses.md: fullname & bio are optionnal
[ci skip]
|
5 years ago |
|
Alex S
|
f46295faa7
|
unused config paramater
|
5 years ago |
|
Maksim
|
1040caf096
|
fix format
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
|
5 years ago |
|
lambda
|
aacac9da0b
|
Merge branch 'feature/bbs' into 'develop'
BBS / SSH
See merge request pleroma/pleroma!997
|
5 years ago |
|
Alexander Strizhakov
|
ce6ca0fefe
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
|
5 years ago |
|
lain
|
6ad8ddfd29
|
Merge remote-tracking branch 'origin/develop' into feature/bbs
|
5 years ago |
|
xse
|
2982061dfa
|
Fix syntax highlighting + clarify :frontend_configuration
|
5 years ago |
|
Mark Felder
|
24c3e2db2c
|
Add mediaproxy whitelist capability
|
5 years ago |
|
kaniini
|
7dcac0bac0
|
Merge branch 'develop' into 'develop'
Add shortcode_globs setting to documentation
See merge request pleroma/pleroma!1087
|
5 years ago |
|
ilja
|
74ef14b04e
|
Add :emoji settings to config.md
|
5 years ago |
|
Alex S
|
d35246c449
|
added healthcheck setting to instance config
|
5 years ago |
|
Ekaterina Vaartis
|
8f93d4c423
|
Remove most finmoji mentions where appropriate
|
6 years ago |
|
Alexander Strizhakov
|
ada384207b
|
typo fix
docs for RelMe provider
|
6 years ago |
|
kaniini
|
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 |
|
Hakurei Reimu
|
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 |
|
Alex S
|
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 |
|
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'
Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019
|
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
# Conflicts:
# docs/config.md
# test/support/factory.ex
|
6 years ago |
|
lambda
|
b4da2bc1d0
|
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
# Conflicts:
# config/config.exs
# docs/config.md
|
6 years ago |
|
Ivan Tashkinov
|
e3328bc138
|
[#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.
|
6 years ago |
