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 |
|
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 |
|
Alexander Strizhakov
|
5db6ac8ee4
|
removing migrate_from_db endpoint from admin api
|
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 |
|
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 |
|
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
|
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 |
|
rinpatch
|
263abe3ba5
|
Merge branch 'emoji-reactions-reacted' into 'develop'
Emoji reactions: Add `reacted` field
See merge request pleroma/pleroma!2160
|
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 |
|
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
|
a802e07241
|
Emoji Reactions: Add `reacted` field to emoji reactions
|
5 years ago |
|
Alexander Strizhakov
|
1f4fbe9d98
|
title parse improvement
|
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
|
e816edbb2f
|
Update streamer_test.exs
|
5 years ago |
|
lain
|
77f24525ca
|
Streamer: Correctly handle reblog mutes
|
5 years ago |
|
Maksim Pechnikov
|
02c3dd2e3d
|
update ecto
|
5 years ago |
|
Maksim Pechnikov
|
be926863a8
|
fix test
|
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 |
|
Mark Felder
|
d770cffce0
|
Merge branch 'develop' into issue/1280
|
5 years ago |
|
Alexander Strizhakov
|
e93cc561cd
|
restarting pleroma from outside application
|
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
|
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 |
|
lain
|
347f3ed2c6
|
Emoji reactions: Change api format once more
|
5 years ago |
|
lain
|
34fc0ca053
|
Emoji reactions: Add sanity checks for the cache
|
5 years ago |
|
Maksim Pechnikov
|
2cfe1b9385
|
Merge branch 'develop' into feature/tag_feed
|
5 years ago |
|
Haelwenn
|
dddebee047
|
Merge branch 'emoji-notifications' into 'develop'
Emoji notifications
See merge request pleroma/pleroma!2130
|
5 years ago |
|
lain
|
615b72238e
|
Notifications: Add emoji reaction notifications
|
5 years ago |
|
feld
|
be27777156
|
Merge branch 'admin-be' into 'develop'
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
|
5 years ago |
|
lain
|
dd3fc50ea4
|
Emoji reactions: Change cache and reply format
|
5 years ago |
|
Alexander Strizhakov
|
d5f8a88a37
|
support for updating env after settings deletion
|
5 years ago |
|
Alexander Strizhakov
|
32a643a159
|
Merge branch 'develop' into admin-be
|
5 years ago |
|
Maksim Pechnikov
|
5ea8596448
|
Merge branch 'develop' into feature/tag_feed
|
5 years ago |
|
rinpatch
|
04c9ca5d68
|
Merge branch 'emoji-reaction-extensions' into 'develop'
StatusView: Add `emoji_reactions`
See merge request pleroma/pleroma!2120
|
5 years ago |
|
Alexander Strizhakov
|
503d966e9f
|
Merge branch 'develop' into admin-be
|
5 years ago |
|
Alexander Strizhakov
|
dcae5914d1
|
fix for db key
|
5 years ago |
|
Maksim Pechnikov
|
41e2332007
|
Merge branch 'develop' into feature/tag_feed
|
5 years ago |
|
Maksim Pechnikov
|
6e88a7e591
|
exclude blocked user posts from search results
|
5 years ago |
|
lain
|
7d8b709d29
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
|
5 years ago |
|
Ivan Tashkinov
|
ca3b4de2c9
|
[#1521] AdminApiControllerTest: fixed create report test (OAuth).
|
5 years ago |
