Ivan Tashkinov
|
e84fee5b86
|
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
|
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
|
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
|
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 |
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 |
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
|
b3a877d6c9
|
Emoji Reactions: Correctly handle deleted users
|
5 years ago |
lain
|
a802e07241
|
Emoji Reactions: Add `reacted` field to emoji reactions
|
5 years ago |
Alexander Strizhakov
|
1f4fbe9d98
|
title parse improvement
|
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
|
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
|
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 |
Roman Chvanikov
|
d18a2e4e36
|
Add test for custom base_url when deleting an attachment
|
5 years ago |
Roman Chvanikov
|
804a702f97
|
Fix base_url string trimming
|
5 years ago |
Roman Chvanikov
|
dea968463d
|
Add logging
|
5 years ago |
lain
|
46915207b6
|
Remove `whole_db` parameter everywhere, it's not used anymore
|
5 years ago |
lain
|
e3fae3380e
|
Apply suggestion to lib/pleroma/web/feed/tag_controller.ex
|
5 years ago |
Roman Chvanikov
|
7f78bd7e37
|
Fix __MODULE__ usage
|
5 years ago |
lain
|
95afcae194
|
Merge branch 'support/update_ecto' into 'develop'
updated ecto and fixed warning
See merge request pleroma/pleroma!2150
|
5 years ago |
lain
|
4f004ab92e
|
Merge branch 'fix/attachments-cleanup' into 'develop'
Fix/attachments cleanup
See merge request pleroma/pleroma!2148
|
5 years ago |
Maksim Pechnikov
|
02c3dd2e3d
|
update ecto
|
5 years ago |
Roman Chvanikov
|
eb4870e1cd
|
Remove unused var
|
5 years ago |
Roman Chvanikov
|
52e08ec9fd
|
explicitly describe perform op in AttachmentsClenupWorker
|
5 years ago |
Maksim Pechnikov
|
bcffa662dc
|
Merge branch 'develop' into feature/tag_feed
|
5 years ago |
Hakaba Hitoyo
|
dabd535e43
|
Remove user recommendation by third party engine
|
5 years ago |
Roman Chvanikov
|
86c4b76bf0
|
Fix typo
|
5 years ago |
feld
|
36838b516f
|
Merge branch 'fix/runtime-config' into 'develop'
Fixes for runtime config
See merge request pleroma/pleroma!2143
|
5 years ago |
Mark Felder
|
d770cffce0
|
Merge branch 'develop' into issue/1280
|
5 years ago |
Ivan Tashkinov
|
86e4d23acb
|
[#1505] Background fetching of incoming activities' `replies` collections.
|
5 years ago |
Alexander Strizhakov
|
de4102b247
|
can be changed in runtime
|
5 years ago |
Maksim Pechnikov
|
99c0a11c58
|
added atom feed
|
5 years ago |
Maksim Pechnikov
|
055edd3d72
|
Merge branch 'develop' into feature/tag_feed
|
5 years ago |
rinpatch
|
8533b63d1f
|
Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop'
Fix for non existing atom
Closes #1532
See merge request pleroma/pleroma!2139
|
5 years ago |
rinpatch
|
0fceeb44b3
|
Merge branch 'emoji-reaction-sanity-check' into 'develop'
Emoji reactions: Add sanity checks for the cache
See merge request pleroma/pleroma!2132
|
5 years ago |