aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Expand)Author
2020-03-25Merge branch 'benchmark_timeline' into 'develop'rinpatch
2020-03-25[#1364] Minor improvements / comments.Ivan Tashkinov
2020-03-25Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications...Ivan Tashkinov
2020-03-25Fixed incorrect usage of "relations" as a short form of "relationships".Ivan Tashkinov
2020-03-24Merge branch 'fix/activity-deletion' into 'develop'feld
2020-03-24Merge branch 'admin-api-change-password' into 'develop'lain
2020-03-24Fix activity deletionEgor Kislitsyn
2020-03-23Merge branch 'bugfix/profile-bio-newline' into 'develop'rinpatch
2020-03-23Benchmarks: Add timeline benchmarklain
2020-03-23Add emoji support in statuses in staticfeEgor Kislitsyn
2020-03-22AccountView: fix for other forms of <br> in bioHaelwenn (lanodan) Monnier
2020-03-22Mastodon API Account view: Remove an outdated hackrinpatch
2020-03-20Merge branch 'fix-feed-pagination' into 'develop'lain
2020-03-20restrict_unauthenticated settingAlexander Strizhakov
2020-03-20include_types parameter in /api/v1/notificationsAlexander Strizhakov
2020-03-16[#1364] Improved notification-related tests.Ivan Tashkinov
2020-03-16Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/...eugenijm
2020-03-16Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`eugenijm
2020-03-16removing with_move parameterAlexander Strizhakov
2020-03-16Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications...Ivan Tashkinov
2020-03-16fix for content-type header for tag feedAlexander Strizhakov
2020-03-16adding rss for user feedAlexander Strizhakov
2020-03-16fix for feed page paginationAlexander Strizhakov
2020-03-15static_fe: Sanitize HTML in usersHaelwenn (lanodan) Monnier
2020-03-15static_fe: Sanitize HTML in postsHaelwenn (lanodan) Monnier
2020-03-15Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'lain
2020-03-15[#1364] Improved control over generation / sending of notifications. Fixed bl...Ivan Tashkinov
2020-03-15Merge branch 'f' into 'develop'Haelwenn
2020-03-15Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'Haelwenn
2020-03-15rip out fetch_initial_postsrinpatch
2020-03-15pleroma_api_controller.ex: Improve conversations error reportingHaelwenn (lanodan) Monnier
2020-03-14Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federatin...Ivan Tashkinov
2020-03-14Merge branch 'fix/cache-control-headers' into 'develop'rinpatch
2020-03-13uploaded media plug: do not inject compile-time params on every requestrinpatch
2020-03-13Merge branch 'feature/mastofe-admin-scope' into 'develop'rinpatch
2020-03-13Merge branch 'fix/hashtags-streaming' into 'develop'rinpatch
2020-03-13Merge branch 'static-accept-missing' into 'develop'rinpatch
2020-03-13rate limiter: disable based on if remote ip was found, not on if the plug was...rinpatch
2020-03-13Merge branch 'bugfix/br-vs-newline' into 'develop'rinpatch
2020-03-13Merge branch 'develop' into fix/cache-control-headersMark Felder
2020-03-13LintMark Felder
2020-03-13Synchronize cache-control header for local media with the mediaproxyMark Felder
2020-03-13Set correct Cache-Control header for local mediaMark Felder
2020-03-13Update comment to reflect what the code is actually doingMark Felder
2020-03-13Do not trust remote Cache-Control headers for mediaproxyMark Felder
2020-03-13Merge branch 'revert/cache-control' into 'develop'rinpatch
2020-03-13Fix hashtags WebSocket streamingEgor Kislitsyn
2020-03-13Formatting: Do not use \n and prefer <br> insteadHaelwenn (lanodan) Monnier
2020-03-12Merge branch 'exclude-posts-visible-to-admin' into 'develop'feld
2020-03-12Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federatin...Ivan Tashkinov