summaryrefslogtreecommitdiff
path: root/test/web
AgeCommit message (Collapse)Author
2020-02-06removing confusing errorAlexander Strizhakov
2020-02-05Merge branch 'fix/unpinnable-polls' into 'develop'rinpatch
fix not being able to pin polls See merge request pleroma/pleroma!2172
2020-02-05removing migrate_from_db endpoint from admin apiAlexander Strizhakov
2020-02-05Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'rinpatch
Restarting pleroma from outside application See merge request pleroma/pleroma!2144
2020-02-05Add support for cancellation of a follow requestEgor Kislitsyn
2020-02-05Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1505-threads-federation
2020-02-03Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-02-02fix not being able to pin pollsrinpatch
2020-02-02mastodon API: do not sanitize html in non-html fieldsrinpatch
2020-01-30Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'rinpatch
Disable rate limiter for socket/localhost Closes #1380 See merge request pleroma/pleroma!2064
2020-01-30Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhostrinpatch
2020-01-30Emoji Reactions: Actually use the validation.lain
2020-01-30Merge branch 'emoji-api-errors' into 'develop'feld
Emoji api error if emoji dir is not writable Closes admin-fe#62 See merge request pleroma/pleroma!2161
2020-01-30Merge branch 'emoji-reactions-reacted' into 'develop'rinpatch
Emoji reactions: Add `reacted` field See merge request pleroma/pleroma!2160
2020-01-29Merge branch 'fix-streaming-reblog' into 'develop'Haelwenn
Streamer: Correctly handle reblog mutes Closes #1129 and #1438 See merge request pleroma/pleroma!2156
2020-01-29emoji api error on not writable dirAlexander Strizhakov
2020-01-29Merge branch 'fix-streaming-reblog' of git.pleroma.social:pleroma/pleroma ↵lain
into fix-streaming-reblog
2020-01-29Streamer Tests: code readability improvementslain
2020-01-29Emoji Reactions: Correctly handle deleted userslain
2020-01-29Emoji Reactions: Add `reacted` field to emoji reactionslain
2020-01-29title parse improvementAlexander Strizhakov
2020-01-28Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-01-28Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-28Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/remote-follow-userpage-redirect
2020-01-28Merge branch 'fix/1524-link_preview' into 'develop'lain
Meta tags parser respects first title tag Closes #1524 See merge request pleroma/pleroma!2157
2020-01-28meta tag parser respect first title headerAlexander Strizhakov
2020-01-28Update streamer_test.exslain
2020-01-28Streamer: Correctly handle reblog muteslain
2020-01-28update ectoMaksim Pechnikov
2020-01-27fix testMaksim Pechnikov
2020-01-27Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-27Remove user recommendation by third party engineHakaba Hitoyo
2020-01-27Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-01-27Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-26Merge branch 'develop' into issue/1280Mark Felder
2020-01-25restarting pleroma from outside applicationAlexander Strizhakov
2020-01-25[#1505] Background fetching of incoming activities' `replies` collections.Ivan Tashkinov
2020-01-24added atom feedMaksim Pechnikov
2020-01-24Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-24Merge branch 'emoji-reaction-sanity-check' into 'develop'rinpatch
Emoji reactions: Add sanity checks for the cache See merge request pleroma/pleroma!2132
2020-01-24Emoji reactions: Change api format once morelain
2020-01-23Emoji reactions: Add sanity checks for the cachelain
2020-01-23Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-23Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-23Merge branch 'emoji-notifications' into 'develop'Haelwenn
Emoji notifications See merge request pleroma/pleroma!2130
2020-01-22Merge branch 'develop' into features/remote-follow-userpage-redirectMark Felder
2020-01-22Notifications: Add emoji reaction notificationslain
2020-01-22[#1505] Added Mastodon-compatible `replies` collection to Note federated ↵Ivan Tashkinov
representation.
2020-01-22Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-22Merge branch 'admin-be' into 'develop'feld
Config api for admin-fe Closes #1406 See merge request pleroma/pleroma!1976