summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Expand)Author
2020-03-23creating trusted app from adminFE & mix taskAlexander Strizhakov
2020-03-22WIP: preloading of user relations for timeline/statuses rendering (performanc...Ivan Tashkinov
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 'develop' into global-status-expirationEgor Kislitsyn
2020-03-20Merge branch 'develop' into gunAlexander Strizhakov
2020-03-20Add embeddable postsEgor Kislitsyn
2020-03-20Merge branch 'fix-feed-pagination' into 'develop'lain
2020-03-20Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-03-20restrict_unauthenticated settingAlexander Strizhakov
2020-03-20include_types parameter in /api/v1/notificationsAlexander Strizhakov
2020-03-19Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activityHaelwenn (lanodan) Monnier
2020-03-19transmogrifier.ex: rework fix_attachment for better IRHaelwenn (lanodan) Monnier
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-19WIPHaelwenn (lanodan) Monnier
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 /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-16fixAlexander Strizhakov
2020-03-16temp fix for `:gun.info` MatchErrorAlexander Strizhakov
2020-03-16Merge branch 'develop' into global-status-expirationEgor Kislitsyn
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-16rate limiter: disable based on if remote ip was found, not on if the plug was...rinpatch
2020-03-16rip out fetch_initial_postsrinpatch
2020-03-16Merge branch 'features/staticfe-sanitization' into 'develop'rinpatch
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-15pleroma_api_controller.ex: Improve conversations error reportingHaelwenn (lanodan) Monnier
2020-03-15Merge branch 'fix/cache-control-headers' into 'develop'rinpatch
2020-03-15auth_controller.ex: Add admin scope to MastoFEHaelwenn (lanodan) Monnier
2020-03-15Fix hashtags WebSocket streamingEgor Kislitsyn
2020-03-15Fix static FE plug to handle missing Accept header.Phil Hagelberg
2020-03-15Formatting: Do not use \n and prefer <br> insteadHaelwenn (lanodan) Monnier
2020-03-15Revert "Set better Cache-Control header for static content"rinpatch
2020-03-15Merge branch 'fix/signup-without-email' into 'develop'feld
2020-03-15Fix enforcement of character limitsMark Felder
2020-03-15Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'rinpatch
2020-03-15relay list shows hosts without accepted followAlexander Strizhakov