Ivan Tashkinov
|
e84fee5b86
|
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
|
5 years ago |
|
lain
|
a56db78935
|
Merge branch 'feature/make_attachments_cleanup_optional' into 'develop'
Make attachments cleanup optional
See merge request pleroma/pleroma!2170
|
5 years ago |
|
Lain Soykaf
|
90b862e7ab
|
Add cheatsheet entry
|
5 years ago |
|
Roman Chvanikov
|
8057157ee3
|
Make attachments cleanup optional
|
5 years ago |
|
rinpatch
|
c27d1d65bf
|
Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'
Disable rate limiter for socket/localhost
Closes #1380
See merge request pleroma/pleroma!2064
|
5 years ago |
|
rinpatch
|
5b62acf6e9
|
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
|
5 years ago |
|
lain
|
774cba84f5
|
Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop'
Re-enable rate limiter and enable remote ip
See merge request pleroma/pleroma!2164
|
5 years ago |
|
lain
|
01537cc1d6
|
Apply suggestion to docs/configuration/cheatsheet.md
|
5 years ago |
|
lain
|
e52e78a937
|
Merge branch 'emoji-reaction-fixie-fixes-uwu' into 'develop'
Emoji Reactions: Actually use the validation.
See merge request pleroma/pleroma!2166
|
5 years ago |
|
lain
|
01fb4dbeae
|
Emoji Reactions: Add fixtures
|
5 years ago |
|
lain
|
a0d9d42eaa
|
Emoji Reactions: Actually use the validation.
|
5 years ago |
|
feld
|
e2f2602fdc
|
Merge branch 'emoji-api-errors' into 'develop'
Emoji api error if emoji dir is not writable
Closes admin-fe#62
See merge request pleroma/pleroma!2161
|
5 years ago |
|
feld
|
df200ea7a4
|
Merge branch 'http-security-warning' into 'develop'
Warn if HTTPSecurityPlug is disabled
Closes #1528
See merge request pleroma/pleroma!2155
|
5 years ago |
|
feld
|
b3e9c87724
|
Update emoji_api_controller.ex
|
5 years ago |
|
feld
|
36becd5573
|
Update http_security_plug.ex
|
5 years ago |
|
rinpatch
|
ff4bef140a
|
Apply suggestion to docs/configuration/cheatsheet.md
|
5 years ago |
|
rinpatch
|
263abe3ba5
|
Merge branch 'emoji-reactions-reacted' into 'develop'
Emoji reactions: Add `reacted` field
See merge request pleroma/pleroma!2160
|
5 years ago |
|
rinpatch
|
889965141a
|
RemoteIp: only trust X-Forwarded-For
Our nginx config will happily pass `Forwarded`/`X-Real-IP` from the
client. Caddy, Apache and Varnish pass `X-Forwarded-For` as well anyway.
|
5 years ago |
|
rinpatch
|
f5cb2af85a
|
cheatsheet: improve rate limiter docs and add new limiters
|
5 years ago |
|
rinpatch
|
7499805abf
|
config.exs: Re-enable rate limiter and enable remote ip
|
5 years ago |
|
Haelwenn
|
946de2299c
|
Merge branch 'fix-streaming-reblog' into 'develop'
Streamer: Correctly handle reblog mutes
Closes #1129 and #1438
See merge request pleroma/pleroma!2156
|
5 years ago |
|
lain
|
505234d975
|
Merge branch 'changelog-update' into 'develop'
Update confusing changelog message for attachments cleanup
See merge request pleroma/pleroma!2163
|
5 years ago |
|
Roman Chvanikov
|
f5f7a0f9c1
|
Update confusing changelog message for attachments cleanup
|
5 years ago |
|
Egor Kislitsyn
|
e07e7888d7
|
Fix credo warning
|
5 years ago |
|
Egor Kislitsyn
|
2bd4d6289b
|
Make the warning more scarier
|
5 years ago |
|
Alexander Strizhakov
|
e7fee0d6fa
|
emoji api error on not writable dir
|
5 years ago |
|
lain
|
7a60cd91ff
|
Merge branch 'fix-streaming-reblog' of git.pleroma.social:pleroma/pleroma into fix-streaming-reblog
|
5 years ago |
|
lain
|
e2e9299b8e
|
Streamer Tests: code readability improvements
|
5 years ago |
|
lain
|
b3a877d6c9
|
Emoji Reactions: Correctly handle deleted users
|
5 years ago |
|
lain
|
d378550d2d
|
Emoji Reactions: Document changes
|
5 years ago |
|
lain
|
a802e07241
|
Emoji Reactions: Add `reacted` field to emoji reactions
|
5 years ago |
|
lain
|
9e0c2413b4
|
Merge branch 'meta-tags-parser' into 'develop'
Title parsing improvement
See merge request pleroma/pleroma!2159
|
5 years ago |
|
Alexander Strizhakov
|
1f4fbe9d98
|
title parse improvement
|
5 years ago |
|
lain
|
f1d5c0f079
|
Merge branch 'frontend-refresh-c54111797ae1058e59931b2d1f12e6ab6a6f96a9' into 'develop'
Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9
See merge request pleroma/pleroma!2158
|
5 years ago |
|
lain
|
f5bfb29d3b
|
Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9
|
5 years ago |
|
lain
|
e8f22451da
|
Merge branch 'linkify-test-expansion' into 'develop'
Formatter: Add a test for domain / username clashes
See merge request pleroma/pleroma!2151
|
5 years ago |
|
lain
|
12b6fcdb8c
|
Merge branch 'features/task-test-email' into 'develop'
Create pleroma.email mix task
Closes #1061
See merge request pleroma/pleroma!2118
|
5 years ago |
|
lain
|
2c121b2623
|
Merge branch 'fix/1524-link_preview' into 'develop'
Meta tags parser respects first title tag
Closes #1524
See merge request pleroma/pleroma!2157
|
5 years ago |
|
Alexander Strizhakov
|
7bd4c14581
|
meta tag parser respect first title header
|
5 years ago |
|
lain
|
10762ea2ac
|
Merge branch 'feature/tag_feed' into 'develop'
[#1452] Atom feeds for hashtags
See merge request pleroma/pleroma!2040
|
5 years ago |
|
lain
|
d385789a45
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed
|
5 years ago |
|
Haelwenn
|
271935953a
|
Merge branch 'whole-db-removal' into 'develop'
Remove `whole_db` parameter everywhere, it's not used anymore
See merge request pleroma/pleroma!2152
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
4eb935be78
|
Create pleroma.email mix task
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
|
5 years ago |
|
lain
|
e816edbb2f
|
Update streamer_test.exs
|
5 years ago |
|
lain
|
77f24525ca
|
Streamer: Correctly handle reblog mutes
|
5 years ago |
|
Egor Kislitsyn
|
6302b40791
|
Warn if HTTPSecurityPlug is disabled
|
5 years ago |
|
feld
|
d9cb8acd3e
|
Merge branch 'fix/attachments-cleanup' into 'develop'
Fix attachments cleanup with custom base_url
See merge request pleroma/pleroma!2154
|
5 years ago |
|
lain
|
ffa9e3a2ce
|
Merge branch 'fix-elixir-v1.10' into 'develop'
Fix compatibility with Elixir v1.10
See merge request pleroma/pleroma!2153
|
5 years ago |
|
Egor Kislitsyn
|
2ddd1bb088
|
Fix compatibility with Elixir v1.10
|
5 years ago |
|
Roman Chvanikov
|
d18a2e4e36
|
Add test for custom base_url when deleting an attachment
|
5 years ago |
