Ivan Tashkinov
|
6ea3c06d8d
|
[#1505] Minor refactoring.
|
5 years ago |
|
Ivan Tashkinov
|
7c3991f59e
|
[#1505] Fixed `replies` serialization (included objects' ids instead of activities' ids).
|
5 years ago |
|
Ivan Tashkinov
|
4e6bbdc7b5
|
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
|
5 years ago |
|
Ivan Tashkinov
|
d458f4fdca
|
[#1505] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.
|
5 years ago |
|
lain
|
964b4d82a0
|
Merge branch 'fix/upload-limit-otp' into 'develop'
Actually fix upload limit on OTP releases
Closes #1109
See merge request pleroma/pleroma!2185
|
5 years ago |
|
rinpatch
|
15ea75cd2a
|
Actually fix upload limit on OTP releases
Closes #1109
|
5 years ago |
|
Haelwenn
|
1262357ddb
|
Merge branch 'cancel-follow-request' into 'develop'
Add support for cancellation of a follow request
Closes #1522
See merge request pleroma/pleroma!2175
|
5 years ago |
|
Lain Soykaf
|
d85bcc8627
|
Questions: Add timezone to `closed` property
|
5 years ago |
|
Egor Kislitsyn
|
bc2e98b200
|
Add User.get_follow_state/2
|
5 years ago |
|
Lain Soykaf
|
8a79f20c21
|
EmojiReactions: Rename to EmojiReacts
|
5 years ago |
|
feld
|
df0b00b32d
|
Merge branch 'mastoapi-non-html-strings' into 'develop'
mastodon API: do not sanitize html in non-html fields
See merge request pleroma/pleroma!2167
|
5 years ago |
|
Egor Kislitsyn
|
8b9742ecf5
|
Cancellation of a follow request for a remote user
|
5 years ago |
|
Alexander Strizhakov
|
c85aa6e87f
|
removing confusing error
|
5 years ago |
|
rinpatch
|
15cb1f6804
|
Merge branch 'fix/unpinnable-polls' into 'develop'
fix not being able to pin polls
See merge request pleroma/pleroma!2172
|
5 years ago |
|
rinpatch
|
72d767998c
|
Merge branch 'removing-admin-api-endpoint' into 'develop'
Removing migrate_from_db endpoint from admin api
See merge request pleroma/pleroma!2177
|
5 years ago |
|
feld
|
b21e59da5f
|
Merge branch 'remove-linker-scheme-option' into 'develop'
Remove AutoLinker `scheme` option from the config
See merge request pleroma/pleroma!2176
|
5 years ago |
|
Alexander Strizhakov
|
5db6ac8ee4
|
removing migrate_from_db endpoint from admin api
|
5 years ago |
|
Egor Kislitsyn
|
3909b5b7b3
|
Remove AutoLinker `scheme` option from the config
|
5 years ago |
|
rinpatch
|
49e80a1537
|
Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
Restarting pleroma from outside application
See merge request pleroma/pleroma!2144
|
5 years ago |
|
Egor Kislitsyn
|
8c71f7e11a
|
Add support for cancellation of a follow request
|
5 years ago |
|
Ivan Tashkinov
|
e84fee5b86
|
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
|
5 years ago |
|
rinpatch
|
50f5a92021
|
fix not being able to pin polls
|
5 years ago |
|
rinpatch
|
983a87175e
|
mastodon API: do not sanitize html in non-html fields
|
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 |
