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
01fb4dbeae
Emoji Reactions: Add fixtures
5 years ago
a0d9d42eaa
Emoji Reactions: Actually use the validation.
5 years ago
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
df200ea7a4
Merge branch 'http-security-warning' into 'develop'
...
Warn if HTTPSecurityPlug is disabled
Closes #1528
See merge request pleroma/pleroma!2155
5 years ago
b3e9c87724
Update emoji_api_controller.ex
5 years ago
36becd5573
Update http_security_plug.ex
5 years ago
263abe3ba5
Merge branch 'emoji-reactions-reacted' into 'develop'
...
Emoji reactions: Add `reacted` field
See merge request pleroma/pleroma!2160
5 years ago
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
505234d975
Merge branch 'changelog-update' into 'develop'
...
Update confusing changelog message for attachments cleanup
See merge request pleroma/pleroma!2163
5 years ago
f5f7a0f9c1
Update confusing changelog message for attachments cleanup
5 years ago
e07e7888d7
Fix credo warning
5 years ago
2bd4d6289b
Make the warning more scarier
5 years ago
e7fee0d6fa
emoji api error on not writable dir
5 years ago
7a60cd91ff
Merge branch 'fix-streaming-reblog' of git.pleroma.social:pleroma/pleroma into fix-streaming-reblog
5 years ago
e2e9299b8e
Streamer Tests: code readability improvements
5 years ago
b3a877d6c9
Emoji Reactions: Correctly handle deleted users
5 years ago
d378550d2d
Emoji Reactions: Document changes
5 years ago
a802e07241
Emoji Reactions: Add `reacted` field to emoji reactions
5 years ago
9e0c2413b4
Merge branch 'meta-tags-parser' into 'develop'
...
Title parsing improvement
See merge request pleroma/pleroma!2159
5 years ago
1f4fbe9d98
title parse improvement
5 years ago
f1d5c0f079
Merge branch 'frontend-refresh-c54111797ae1058e59931b2d1f12e6ab6a6f96a9' into 'develop'
...
Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9
See merge request pleroma/pleroma!2158
5 years ago
f5bfb29d3b
Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9
5 years ago
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
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
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
7bd4c14581
meta tag parser respect first title header
5 years ago
10762ea2ac
Merge branch 'feature/tag_feed' into 'develop'
...
[#1452 ] Atom feeds for hashtags
See merge request pleroma/pleroma!2040
5 years ago
d385789a45
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed
5 years ago
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
4eb935be78
Create pleroma.email mix task
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
5 years ago
e816edbb2f
Update streamer_test.exs
5 years ago
77f24525ca
Streamer: Correctly handle reblog mutes
5 years ago
6302b40791
Warn if HTTPSecurityPlug is disabled
5 years ago
d9cb8acd3e
Merge branch 'fix/attachments-cleanup' into 'develop'
...
Fix attachments cleanup with custom base_url
See merge request pleroma/pleroma!2154
5 years ago
ffa9e3a2ce
Merge branch 'fix-elixir-v1.10' into 'develop'
...
Fix compatibility with Elixir v1.10
See merge request pleroma/pleroma!2153
5 years ago
2ddd1bb088
Fix compatibility with Elixir v1.10
5 years ago
d18a2e4e36
Add test for custom base_url when deleting an attachment
5 years ago
804a702f97
Fix base_url string trimming
5 years ago
dea968463d
Add logging
5 years ago
46915207b6
Remove `whole_db` parameter everywhere, it's not used anymore
5 years ago
e3fae3380e
Apply suggestion to lib/pleroma/web/feed/tag_controller.ex
5 years ago
7f78bd7e37
Fix __MODULE__ usage
5 years ago
6fab5fe7f8
Merge branch 'translation/errors-french' into 'develop'
...
Translation/errors french
See merge request pleroma/pleroma!1457
5 years ago
dd5a24073f
Merge branch 'docs_introduction' into 'develop'
...
DOCS General update for the "Introduction to Pleroma" section
See merge request pleroma/pleroma!2101
5 years ago
c8964cc438
DOCS General update for the "Introduction to Pleroma" section
...
* Put url's between angle brackets. docs-develop doesn't list the url's as links, I assume these will fix that (but don't know if I can check)
* Added a third space before the "sub"bulletpoints. docs-develop doesn't show them as subpoints with only two spaces. I hope three will fix it (but don't know if I can check)
* Added a newline above the bulletpoints because otherwise they are broken on docs-develop
* Remove the 😄 thingies because neither of the docs (docs.pleroma.social and docs-develop.social) show them as emojis
* Add a link to fediverse.network
* Update to add new stuff and fix things that aren't correct (any more)
5 years ago
95afcae194
Merge branch 'support/update_ecto' into 'develop'
...
updated ecto and fixed warning
See merge request pleroma/pleroma!2150
5 years ago
4f004ab92e
Merge branch 'fix/attachments-cleanup' into 'develop'
...
Fix/attachments cleanup
See merge request pleroma/pleroma!2148
5 years ago
51283bf996
Formatter: Add a test for domain / username clashes
5 years ago
02c3dd2e3d
update ecto
5 years ago
lain