lain
|
294628d981
|
Merge branch 'feature/expire-mutes' into 'develop'
Expiring mutes for users and activities
Closes #1817
See merge request pleroma/pleroma!2971
|
4 years ago |
|
lain
|
d8d4e96230
|
Merge branch 'default-mrf' into 'develop'
Add TagPolicy as default MRF
See merge request pleroma/pleroma!2834
|
4 years ago |
|
lain
|
dd2b3a8da9
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
|
4 years ago |
|
Egor Kislitsyn
|
d2113428c0
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
4 years ago |
|
Mark Felder
|
89c356d19f
|
Improve Keyword descriptions for AdminFE
|
4 years ago |
|
Egor Kislitsyn
|
4a2d7a7a5d
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
4 years ago |
|
feld
|
03a318af9a
|
Merge branch 'develop' into 'feature/autofollowing'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Mark Felder
|
291189357b
|
Merge branch 'develop' into feature/account-export
|
4 years ago |
|
Mark Felder
|
9e54ef086b
|
Merge branch 'develop' into feature/account-export
|
4 years ago |
|
feld
|
5aff479951
|
Merge branch '1668-prometheus-access-restrictions' into 'develop'
[#1668] App metrics endpoint (Prometheus) access restrictions
Closes #1668
See merge request pleroma/pleroma!3093
|
4 years ago |
|
feld
|
e062329a17
|
Merge branch 'develop' into 'feature/autofollowing'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
feld
|
d6907e6e0c
|
Merge branch 'chore/elixir-1.11' into 'develop'
Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059
|
4 years ago |
|
Egor Kislitsyn
|
e87901c424
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
4 years ago |
|
Ivan Tashkinov
|
50d4280880
|
[#1668] Formatting fix.
|
4 years ago |
|
Egor Kislitsyn
|
ad605e3e16
|
Rename `Pleroma.Backup` to `Pleroma.User.Backup`
|
4 years ago |
|
Ivan Tashkinov
|
3a28aa8814
|
[#1668] Added :prometheus group config to config/description.exs.
|
4 years ago |
|
Ivan Tashkinov
|
524fb0e4c2
|
[#1668] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint.
Added tests and documentation.
|
4 years ago |
|
Ivan Tashkinov
|
9ea31b373f
|
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
|
4 years ago |
|
Mark Felder
|
efd6572ffb
|
Remove suggestions
|
4 years ago |
|
Mark Felder
|
405f27b4f8
|
The suggestions are problematic as they need to be real local account names
|
4 years ago |
|
Mark Felder
|
1b8fd7e65a
|
Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts
|
4 years ago |
|
Mark Felder
|
1fb9452131
|
Merge branch 'develop' into feature/account-export
|
4 years ago |
|
Mark Felder
|
b738f70953
|
Merge branch 'develop' into feature/gen-magic
|
4 years ago |
|
Mark Felder
|
64553ebae2
|
Merge branch 'develop' into chore/elixir-1.11
|
4 years ago |
|
Alexander Strizhakov
|
3be8ab5103
|
RemoteIp module name
|
4 years ago |
|
Mark Felder
|
04b514c567
|
Merge branch 'develop' into feature/gen-magic
|
4 years ago |
|
Haelwenn
|
74be4de3f6
|
Merge branch 'fix/2209-remoteip' into 'develop'
#2209 RemoteIP CIDR helper, config and doc improvements
See merge request pleroma/pleroma!3057
|
4 years ago |
|
Mark Felder
|
87fc5a40f4
|
instrumenters has no effect in Endpoint anymore
|
4 years ago |
|
Mark Felder
|
fddea9e3ce
|
:pubsub is deprecated and replaced wit :pubsub_server
|
4 years ago |
|
Egor Kislitsyn
|
e52dd62e14
|
Add configurable temporary directory
|
4 years ago |
|
Egor Kislitsyn
|
3ad7492f9d
|
Add config for Pleroma.Backup
|
4 years ago |
|
Egor Kislitsyn
|
a0ad9bd734
|
Add BackupWorker
|
4 years ago |
|
Mark Felder
|
b90eda3d8b
|
Improve description yet again
|
4 years ago |
|
Mark Felder
|
e08eb4aba0
|
Don't leak internal variables in the docs. They're useless to users.
|
4 years ago |
|
Mark Felder
|
b8c05f4876
|
Improve descriptions for reserved and proxies
|
4 years ago |
|
Mark Felder
|
d43d05005a
|
Move hardcoded default configuration into config.exs
|
4 years ago |
|
Mark Felder
|
7aff2b47c5
|
Fix docs for default headers used by RemoteIp. We only use X-Forwarded-For by default.
|
4 years ago |
|
rinpatch
|
0a69dbc97c
|
Merge branch 'feature/update-description-for-frontends-setting' into 'develop'
Remove extra nesting and add labels in `:frontends` setting
See merge request pleroma/pleroma!3043
|
4 years ago |
|
Alexander Strizhakov
|
cbdaabad34
|
web push http_client fix
|
4 years ago |
|
Angelina Filippova
|
d96b8923f6
|
Fix typo
|
4 years ago |
|
Angelina Filippova
|
fe19750644
|
Fix comma typo
|
4 years ago |
|
Angelina Filippova
|
1b2f7139c8
|
Apply 1 suggestion(s) to 1 file(s)
|
4 years ago |
|
Angelina Filippova
|
0e57f13365
|
Apply 1 suggestion(s) to 1 file(s)
|
4 years ago |
|
Angelina Filippova
|
7ac4d1e7ee
|
Remove extra nesting and add labels in `:frontends` setting
|
4 years ago |
|
Roman Chvanikov
|
8f5589cf66
|
Merge develop
|
4 years ago |
|
Mark Felder
|
7b2bf381e9
|
Chase the Autolinker rename from !2677
|
4 years ago |
|
Roman Chvanikov
|
4987ee6256
|
Merge branch 'develop' into feature/expire-mutes
|
4 years ago |
|
feld
|
6c052bd5b6
|
Merge branch 'media-preview-proxy-nostream' into 'develop'
Media preview proxy
See merge request pleroma/pleroma!3001
|
4 years ago |
|
lain
|
7e02f4ed3b
|
Merge branch 'feature/2118-web-push-encryption-http' into 'develop'
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter
Closes #2118
See merge request pleroma/pleroma!3008
|
4 years ago |
|
Steven Fuchs
|
f2ef9735c5
|
Federate data through persistent websocket connections
|
4 years ago |
