alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,269 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

2290 Commits

Author SHA1 Message Date
rinpatch ea1631d7e6 Make Floki use fast_html 2020-02-11 16:17:21 +03:00
lain 24c526a0b1 Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge 2020-02-11 13:58:36 +01:00
Maksim Pechnikov 6813c0302c Merge branch 'develop' into issue/1383 2020-02-10 20:49:20 +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 4538a1ee01 EmojiReactions: Remove old API endpoints 2020-02-07 15:01:45 +01:00
Lain Soykaf f875b9650a EmojiReactions: Add Mastodon-aligned reaction endpoints, change response 2020-02-07 14:52:13 +01:00
Egor Kislitsyn bc2e98b200
Add User.get_follow_state/2 2020-02-07 16:17:34 +04: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
Egor Kislitsyn 8b9742ecf5 Cancellation of a follow request for a remote user 2020-02-06 18:02:33 +04: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
Maksim Pechnikov 2c40c8b4a2 Merge branch 'develop' into issue/1383 2020-02-03 21:42:36 +03: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
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
 2020-01-30 19:24:04 +00:00
rinpatch 5b62acf6e9 Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost 2020-01-30 22:16:55 +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
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 7a60cd91ff Merge branch 'fix-streaming-reblog' of git.pleroma.social:pleroma/pleroma into fix-streaming-reblog 2020-01-29 11:52:24 +01:00
lain e2e9299b8e Streamer Tests: code readability improvements 2020-01-29 11:50:49 +01: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
Maksim Pechnikov 21a2a05407 Merge branch 'develop' into issue/1383 2020-01-28 20:39:20 +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 e816edbb2f Update streamer_test.exs 2020-01-28 15:42:05 +00:00
lain 77f24525ca Streamer: Correctly handle reblog mutes 2020-01-28 16:40:44 +01:00
Maksim Pechnikov 02c3dd2e3d update ecto 2020-01-28 10:43:47 +03:00
Maksim Pechnikov be926863a8 fix test 2020-01-27 21:20:33 +03: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
Maksim Pechnikov bfc70fdf29 Merge branch 'develop' into issue/1383 2020-01-27 08:48:19 +03: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
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
Maksim Pechnikov 5fc2fa8908 Merge branch 'develop' into issue/1383 2020-01-23 11:11:18 +03:00