aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2020-03-24Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactionsHaelwenn (lanodan) Monnier
2020-03-24Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
relations-preloading-for-statuses-rendering
2020-03-24Implemented preloading of relationships with parent activities' actors for ↵Ivan Tashkinov
statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).
2020-03-24Merge branch 'fix/activity-deletion' into 'develop'feld
Fix activity deletion Closes #1640 See merge request pleroma/pleroma!2328
2020-03-24Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.exrinpatch
2020-03-24Apply suggestion to lib/pleroma/web/activity_pub/pipeline.exlain
2020-03-24Apply suggestion to ↵lain
lib/pleroma/web/activity_pub/object_validators/create_validator.ex
2020-03-24Merge branch 'admin-api-change-password' into 'develop'lain
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials` See merge request pleroma/pleroma!2149
2020-03-24Fix activity deletionEgor Kislitsyn
2020-03-23Merge branch 'bugfix/profile-bio-newline' into 'develop'rinpatch
AccountView: fix for other forms of <br> in bio Closes #1643 See merge request pleroma/pleroma!2322
2020-03-23Benchmarks: Add timeline benchmarklain
2020-03-23Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
relations-preloading-for-statuses-rendering
2020-03-23Add emoji support in statuses in staticfeEgor Kislitsyn
2020-03-23Preloading of follow relations for timeline/statuses rendering (performance ↵Ivan Tashkinov
improvement). Refactoring.
2020-03-22WIP: preloading of user relations for timeline/statuses rendering ↵Ivan Tashkinov
(performance improvement).
2020-03-22AccountView: fix for other forms of <br> in bioHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
2020-03-22Mastodon API Account view: Remove an outdated hackrinpatch
The hack with caching the follow relationship was introduced when we still were storing it inside the follow activity, resulting in slow queries. Now we store follow state in `FollowRelationship` table, so this is no longer necessary.
2020-03-20Merge branch 'develop' into gunAlexander Strizhakov
2020-03-20Merge branch 'fix-feed-pagination' into 'develop'lain
Fix for feed page pagination Closes #1605 See merge request pleroma/pleroma!2281
2020-03-20Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-2
2020-03-20restrict_unauthenticated settingAlexander Strizhakov
2020-03-20include_types parameter in /api/v1/notificationsAlexander Strizhakov
2020-03-19Fix linting.lain
2020-03-19Merge branch 'remake-remodel' into developlain
2020-03-19Add emoji reactions to features in nodeinfoMark Felder
2020-03-18Merge branch 'develop' into gunAlexander Strizhakov
2020-03-16[#1364] Improved notification-related tests.Ivan Tashkinov
2020-03-16Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET ↵eugenijm
/api/pleroma/admin/users/:nickname/credentials`.
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 ↵Ivan Tashkinov
1364-notifications-sending-control
2020-03-16fixAlexander Strizhakov
2020-03-16temp fix for `:gun.info` MatchErrorAlexander Strizhakov
2020-03-16Merge branch 'develop' into gunAlexander Strizhakov
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
Note: Seems to have different sanitization with TwitterCard generator giving the following: <meta content=\"“alert(&#39;xss&#39;)”\" property=\"twitter:description\">
2020-03-15Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'lain
[#1560] Restricted AP- & OStatus-related routes for non-federating instances Closes #1560 See merge request pleroma/pleroma!2235
2020-03-15[#1364] Improved control over generation / sending of notifications. Fixed ↵Ivan Tashkinov
blocking / muting users notifications issue. Added tests.
2020-03-15Merge branch 'f' into 'develop'Haelwenn
rip out fetch_initial_posts Closes #1422 and #1595 See merge request pleroma/pleroma!2297
2020-03-15Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'Haelwenn
rate limiter: disable based on if remote ip was found, not on if the plug was enabled Closes #1620 See merge request pleroma/pleroma!2296
2020-03-15rip out fetch_initial_postsrinpatch
Every time someone tries to use it, it goes mad and tries to scrape the entire fediverse for no visible reason, it's better to just remove it than continue shipping it in it's current state. idea acked by lain and feld on irc Closes #1595 #1422
2020-03-15pleroma_api_controller.ex: Improve conversations error reportingHaelwenn (lanodan) Monnier
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
2020-03-14Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1560-non-federating-instances-routes-restrictions # Conflicts: # lib/pleroma/plugs/static_fe_plug.ex
2020-03-14Merge branch 'fix/cache-control-headers' into 'develop'rinpatch
Fix Cache Control headers on media See merge request pleroma/pleroma!2295
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
auth_controller.ex: Add admin scope to MastoFE See merge request pleroma/pleroma!2256
2020-03-13Merge branch 'fix/hashtags-streaming' into 'develop'rinpatch
Fix hashtags WebSocket streaming Closes #1593 See merge request pleroma/pleroma!2294