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
|
2020-02-08 14:02:36 +00:00 |
|
rinpatch
|
15ea75cd2a
|
Actually fix upload limit on OTP releases
Closes #1109
|
2020-02-07 20:14:06 +03:00 |
|
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
|
2020-02-07 16:10:43 +00:00 |
|
Lain Soykaf
|
d85bcc8627
|
Questions: Add timezone to closed property
|
2020-02-07 16:57:46 +01:00 |
|
Lain Soykaf
|
8a79f20c21
|
EmojiReactions: Rename to EmojiReacts
|
2020-02-06 18:09:57 +01:00 |
|
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
|
2020-02-06 16:08:23 +00:00 |
|
Alexander Strizhakov
|
c85aa6e87f
|
removing confusing error
|
2020-02-06 12:50:36 +03:00 |
|
rinpatch
|
15cb1f6804
|
Merge branch 'fix/unpinnable-polls' into 'develop'
fix not being able to pin polls
See merge request pleroma/pleroma!2172
|
2020-02-05 21:04:16 +00:00 |
|
Alexander Strizhakov
|
5db6ac8ee4
|
removing migrate_from_db endpoint from admin api
|
2020-02-05 20:36:21 +03:00 |
|
rinpatch
|
49e80a1537
|
Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
Restarting pleroma from outside application
See merge request pleroma/pleroma!2144
|
2020-02-05 16:59:21 +00:00 |
|
Egor Kislitsyn
|
8c71f7e11a
|
Add support for cancellation of a follow request
|
2020-02-05 20:22:15 +04:00 |
|
rinpatch
|
50f5a92021
|
fix not being able to pin polls
|
2020-02-02 14:55:06 +03:00 |
|
rinpatch
|
983a87175e
|
mastodon API: do not sanitize html in non-html fields
|
2020-02-02 14:46:32 +03:00 |
|
lain
|
a0d9d42eaa
|
Emoji Reactions: Actually use the validation.
|
2020-01-30 16:07:37 +01:00 |
|
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
|
2020-01-30 14:13:40 +00:00 |
|
feld
|
b3e9c87724
|
Update emoji_api_controller.ex
|
2020-01-30 14:09:41 +00:00 |
|
rinpatch
|
263abe3ba5
|
Merge branch 'emoji-reactions-reacted' into 'develop'
Emoji reactions: Add `reacted` field
See merge request pleroma/pleroma!2160
|
2020-01-30 13:16:04 +00:00 |
|
Haelwenn
|
946de2299c
|
Merge branch 'fix-streaming-reblog' into 'develop'
Streamer: Correctly handle reblog mutes
Closes #1129 and #1438
See merge request pleroma/pleroma!2156
|
2020-01-29 20:21:32 +00:00 |
|
Alexander Strizhakov
|
e7fee0d6fa
|
emoji api error on not writable dir
|
2020-01-29 15:31:34 +03:00 |
|
lain
|
b3a877d6c9
|
Emoji Reactions: Correctly handle deleted users
|
2020-01-29 11:43:36 +01:00 |
|
lain
|
a802e07241
|
Emoji Reactions: Add reacted field to emoji reactions
|
2020-01-29 11:39:06 +01:00 |
|
Alexander Strizhakov
|
1f4fbe9d98
|
title parse improvement
|
2020-01-29 11:13:34 +03:00 |
|
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
|
2020-01-28 16:38:14 +00:00 |
|
Alexander Strizhakov
|
7bd4c14581
|
meta tag parser respect first title header
|
2020-01-28 19:29:27 +03:00 |
|
lain
|
d385789a45
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed
|
2020-01-28 17:06:36 +01:00 |
|
lain
|
77f24525ca
|
Streamer: Correctly handle reblog mutes
|
2020-01-28 16:40:44 +01:00 |
|
lain
|
46915207b6
|
Remove whole_db parameter everywhere, it's not used anymore
|
2020-01-28 14:40:40 +01:00 |
|
lain
|
e3fae3380e
|
Apply suggestion to lib/pleroma/web/feed/tag_controller.ex
|
2020-01-28 13:38:49 +00:00 |
|
Maksim Pechnikov
|
bcffa662dc
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-27 21:13:13 +03:00 |
|
Hakaba Hitoyo
|
dabd535e43
|
Remove user recommendation by third party engine
|
2020-01-27 13:21:50 +00:00 |
|
feld
|
36838b516f
|
Merge branch 'fix/runtime-config' into 'develop'
Fixes for runtime config
See merge request pleroma/pleroma!2143
|
2020-01-26 17:35:21 +00:00 |
|
Mark Felder
|
d770cffce0
|
Merge branch 'develop' into issue/1280
|
2020-01-26 11:23:05 -06:00 |
|
Alexander Strizhakov
|
e93cc561cd
|
restarting pleroma from outside application
|
2020-01-25 18:42:04 +03:00 |
|
Alexander Strizhakov
|
de4102b247
|
can be changed in runtime
|
2020-01-25 10:39:10 +03:00 |
|
Maksim Pechnikov
|
99c0a11c58
|
added atom feed
|
2020-01-24 22:12:23 +03:00 |
|
Maksim Pechnikov
|
055edd3d72
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-24 21:46:57 +03:00 |
|
rinpatch
|
0fceeb44b3
|
Merge branch 'emoji-reaction-sanity-check' into 'develop'
Emoji reactions: Add sanity checks for the cache
See merge request pleroma/pleroma!2132
|
2020-01-24 11:32:25 +00:00 |
|
lain
|
347f3ed2c6
|
Emoji reactions: Change api format once more
|
2020-01-24 10:52:24 +01:00 |
|
lain
|
34fc0ca053
|
Emoji reactions: Add sanity checks for the cache
|
2020-01-23 12:34:34 +01:00 |
|
Maksim Pechnikov
|
2cfe1b9385
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-23 11:42:10 +03:00 |
|
Haelwenn
|
dddebee047
|
Merge branch 'emoji-notifications' into 'develop'
Emoji notifications
See merge request pleroma/pleroma!2130
|
2020-01-23 02:12:03 +00:00 |
|
lain
|
615b72238e
|
Notifications: Add emoji reaction notifications
|
2020-01-22 20:06:12 +01:00 |
|
rinpatch
|
6e6f1ead31
|
Merge branch 'no-error-404' into 'develop'
Log at debug level for object deletion, not error.
See merge request pleroma/pleroma!2066
|
2020-01-22 17:55:49 +00:00 |
|
feld
|
be27777156
|
Merge branch 'admin-be' into 'develop'
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
|
2020-01-22 17:13:17 +00:00 |
|
lain
|
dd3fc50ea4
|
Emoji reactions: Change cache and reply format
|
2020-01-22 13:57:42 +01:00 |
|
Alexander Strizhakov
|
d5f8a88a37
|
support for updating env after settings deletion
|
2020-01-22 15:14:11 +03:00 |
|
Alexander Strizhakov
|
32a643a159
|
Merge branch 'develop' into admin-be
|
2020-01-22 11:22:31 +03:00 |
|
Maksim Pechnikov
|
5ea8596448
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-21 20:56:49 +03:00 |
|
Alexander Strizhakov
|
f01ab6cd29
|
some refactor and tests
|
2020-01-21 18:42:00 +03:00 |
|
rinpatch
|
04c9ca5d68
|
Merge branch 'emoji-reaction-extensions' into 'develop'
StatusView: Add `emoji_reactions`
See merge request pleroma/pleroma!2120
|
2020-01-21 13:13:17 +00:00 |
|