aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Expand)Author
2020-04-02Merge branch 'feature/funkwhale-audio' into 'develop'Haelwenn
2020-04-02Merge branch 'bugfix/funkwhale-channel' into 'develop'Haelwenn
2020-03-31Merge branch 'bugfix/profile-bio-newline' into 'develop'rinpatch
2020-03-31Merge branch 'admin-api-change-password' into 'develop'lain
2020-03-31Merge branch 'fix/activity-deletion' into 'develop'feld
2020-03-31Merge branch '1364-notifications-sending-control' into 'develop'rinpatch
2020-03-16rip out fetch_initial_postsrinpatch
2020-03-16Merge branch 'features/staticfe-sanitization' into 'develop'rinpatch
2020-03-15pleroma_api_controller.ex: Improve conversations error reportingHaelwenn (lanodan) Monnier
2020-03-15auth_controller.ex: Add admin scope to MastoFEHaelwenn (lanodan) Monnier
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
2020-03-05Merge branch 'proper_error_messages' into 'develop'lain
2020-03-04Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'feld
2020-03-04MastodonController: Return 404 errors correctly.lain
2020-03-04Merge branch 'fix/no-email-no-fail' into 'develop'lain
2020-03-03Update CopyrightsMark Felder
2020-03-02Exclude reblogs from `GET /api/pleroma/admin/statuses` by defaulteugenijm
2020-03-02Merge branch 'feature/1482-activity_pub_transactions' into 'develop'Haelwenn
2020-03-02Bump copyright years of files changed after 2020-01-07Haelwenn (lanodan) Monnier
2020-03-01spec fixAlexander Strizhakov
2020-03-01ActivityPub actions & side-effects in transactionAlexander Strizhakov
2020-03-01timeline controller: add a TODO for replacing copypaste with a macrorinpatch
2020-03-01timeline controller: rate limit timelines to 3 requests per 500ms per timelin...rinpatch
2020-02-27Merge branch 'admin-status-list' into 'develop'feld
2020-02-27Do not fail when user has no emailEgor Kislitsyn
2020-02-26Admin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/status...eugenijm
2020-02-26Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts `go...eugenijm
2020-02-25Fix Dialyzer warningsEgor Kislitsyn
2020-02-24Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility s...eugenijm
2020-02-22Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-feder...Ivan Tashkinov
2020-02-20Merge branch 'single_emoji_reaction' into 'develop'Haelwenn
2020-02-20Merge branch 'features/remote-follow-userpage-redirect' into 'develop'lain
2020-02-20Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-feder...Ivan Tashkinov
2020-02-20Merge branch 'feature/new-registrations-digest' into 'develop'lain
2020-02-19Pleroma API: Add endpoint to get reaction information on a single emojilain
2020-02-18Merge branch 'fix/status-view/expires_at' into 'develop'lain
2020-02-18Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-feder...Ivan Tashkinov
2020-02-18Merge branch 'chore/standardize-mrf-behavior' into 'develop'lain
2020-02-18Merge branch 'need-reboot-flag' into 'develop'lain
2020-02-18Fix `status.expires_at` typeEgor Kislitsyn
2020-02-16Use floki's new APIs for parsing fragmentsrinpatch
2020-02-15[#1505] Restricted max thread distance for fetching replies on incoming feder...Ivan Tashkinov
2020-02-15MastodonAPI.StatusView: Do not use site_nameHaelwenn (lanodan) Monnier
2020-02-14Standardize @behaviour usage in MRFsMark Felder
2020-02-13Merge branch 'fix/mrf-transparency-disabling-federation-status' into 'develop'rinpatch