Egor Kislitsyn
|
4f90077767
|
Fix warning
|
4 years ago |
|
Mark Felder
|
f2b74f60f0
|
Merge branch 'develop' into feature/account-export
|
4 years ago |
|
feld
|
7d31122781
|
Merge branch 'fix/prometheus-test' into 'develop'
phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+
See merge request pleroma/pleroma!3105
|
4 years ago |
|
Mark Felder
|
cbe41408e4
|
phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+
|
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 |
|
lain
|
2f7401806b
|
Merge branch 'docs/clients-apc2s' into 'develop'
clients.md: Add AndStatus, note supported protocols
See merge request pleroma/pleroma!3104
|
4 years ago |
|
rinpatch
|
e6dab6513d
|
Merge branch 'patch-1' into 'develop'
Fix link reference
See merge request pleroma/pleroma!3103
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
1de4ff8b4d
|
clients.md: Add AndStatus, note supported protocols
|
4 years ago |
|
Haelwenn
|
073ad7e6d9
|
Merge branch 'docs/ap_c2s' into 'develop'
AP C2S: Document our additional endpoints
See merge request pleroma/pleroma!3056
|
4 years ago |
|
Kana
|
ac692ff3e9
|
Fix link reference
|
4 years ago |
|
Haelwenn
|
2fd384e0a2
|
Merge branch 'fix/sendmail' into 'develop'
Fix ability to use sendmail on Linux distros with systemd
See merge request pleroma/pleroma!3102
|
4 years ago |
|
Mark Felder
|
e7b0840b88
|
NoNewPrivileges breaks ability to send email via sendmail because it restricts ability to run setuid/setgid binaries
|
4 years ago |
|
rinpatch
|
df61071422
|
Merge branch '2242-nsfw-case' into 'develop'
Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive"
Closes #2242
See merge request pleroma/pleroma!3094
|
4 years ago |
|
Haelwenn
|
096e4518ad
|
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!3100
|
4 years ago |
|
shironeko
|
bd033aba48
|
Translated using Weblate (Chinese (Simplified))
Currently translated at 45.2% (48 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hans/
|
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 |
|
Ivan Tashkinov
|
14900164b8
|
[#3059] Used forked prometheus-phx to remove log spam.
|
4 years ago |
|
Ivan Tashkinov
|
8a68673eed
|
[#3059] Formatting fix.
|
4 years ago |
|
rinpatch
|
d031b185e2
|
Merge branch '2257-self-chat' into 'develop'
Resolve "Can't message yourself in a chat (but can start it)"
Closes #2257
See merge request pleroma/pleroma!3099
|
4 years ago |
|
Ivan Tashkinov
|
8a55de1d78
|
[#3059] Fixed Phoenix 1.5 telemetry processing.
|
4 years ago |
|
lain
|
3fdc2a0d1e
|
Changelog: Add information about self-chats
|
4 years ago |
|
lain
|
8d251096fe
|
SideEffects: Correctly handle chat messages sent to yourself
|
4 years ago |
|
Haelwenn
|
77e827bb66
|
Merge branch 'bugfix/ci-majic-release' into 'develop'
CI: Install libmagic-dev in debian release targets
See merge request pleroma/pleroma!3096
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
54d99cbb72
|
CI: Install libmagic-dev in debian release targets
|
4 years ago |
|
Egor Kislitsyn
|
034ac43f3a
|
Fix credo warnings
|
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 |
|
Haelwenn
|
44b2a137d1
|
Merge branch 'bugfix/ci-majic-release' into 'develop'
CI: Install file-dev in alpine release targets
See merge request pleroma/pleroma!3095
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
ccd1e75e35
|
CI: Install file-dev in alpine release targets
|
4 years ago |
|
Haelwenn
|
fe160330e6
|
Merge branch 'fix/autofollower-suggestions' into 'develop'
Remove suggestions for autofollower_nicknames
See merge request pleroma/pleroma!3088
|
4 years ago |
|
Egor Kislitsyn
|
c1976d5b19
|
Fix credo warnings
|
4 years ago |
|
lain
|
e97b254c6b
|
Transmogrifier: Refactor and unify incoming tag handling
|
4 years ago |
|
lain
|
39fd4d7639
|
Transmogrifier: Downcase incoming Hashtags
Also, set sensitive to true if we have an nsfw hashtag present.
|
4 years ago |
|
Egor Kislitsyn
|
98f32cf820
|
Fix tests
|
4 years ago |
|
Haelwenn
|
0495a07dc7
|
Merge branch '2239-mute-fixes' into 'develop'
ActivityPub: Show own replies to muted users.
Closes #2239
See merge request pleroma/pleroma!3084
|
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 |
|
feld
|
be611b143b
|
Merge branch 'chore/changelogfix' into 'develop'
Fix duplicate Added sections in the changelog
See merge request pleroma/pleroma!3091
|
4 years ago |
|
Mark Felder
|
cb3ee4d543
|
Fix duplicate Added sections in the changelog
|
4 years ago |
|
Ivan Tashkinov
|
9ea31b373f
|
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
|
4 years ago |
|
Mark Felder
|
405f27b4f8
|
The suggestions are problematic as they need to be real local account names
|
4 years ago |
|
feld
|
023f726d7f
|
Merge branch 'refactor/discoverable_user_field' into 'develop'
Change user.discoverable field to user.is_discoverable
See merge request pleroma/pleroma!3078
|
4 years ago |
|
Mark Felder
|
fb056ce05b
|
Merge branch 'develop' into refactor/discoverable_user_field
|
4 years ago |
|
Haelwenn
|
724e4b7f00
|
Apply 1 suggestion(s) to 1 file(s)
|
4 years ago |
|
feld
|
5703fb6d2a
|
Merge branch 'issue/2009' into 'develop'
[#2009] fixed install docs (release env)
See merge request pleroma/pleroma!2854
|
4 years ago |
|
Maksim Pechnikov
|
2030ffd490
|
fix test
|
4 years ago |
|
Maksim Pechnikov
|
cf53e300f8
|
added generate the release env to `pleroma.instance gen`
|
4 years ago |
