summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-03-16Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET ↵eugenijm
/api/pleroma/admin/users/:nickname/credentials`.
2020-03-16Merge branch 'docs/mrf_object_age' into 'develop'Haelwenn
Improve documentation of mrf_object_age See merge request pleroma/pleroma!2305
2020-03-16Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`eugenijm
2020-03-16removing with_move parameterAlexander Strizhakov
2020-03-16Improve documentation of mrf_object_ageMark Felder
2020-03-16Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1364-notifications-sending-control
2020-03-16Merge branch 'feat/templates' into 'develop'rinpatch
gitlab: create templates for bug reports and release MRs See merge request pleroma/pleroma!2304
2020-03-16gitlab: create templates for bug reports and release MRsrinpatch
2020-03-16fixAlexander Strizhakov
2020-03-16temp fix for `:gun.info` MatchErrorAlexander Strizhakov
2020-03-16Merge remote-tracking branch 'origin/develop' into global-status-expirationEgor Kislitsyn
2020-03-16Merge branch 'develop' into gunAlexander Strizhakov
2020-03-16Merge branch 'develop' into global-status-expirationEgor Kislitsyn
2020-03-16Merge branch 'fix-warnings-in-tests' into 'develop'rinpatch
Warnings fix See merge request pleroma/pleroma!2303
2020-03-16Merge branch 'develop' into gunAlexander Strizhakov
2020-03-16warnings fixAlexander Strizhakov
2020-03-16Merge branch 'removing-deprecated' into 'develop'rinpatch
Removing from descriptions.exs deprecated settings See merge request pleroma/pleroma!2302
2020-03-16removing from descriptions.exs deprecated settingsAlexander 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-15Merge branch 'release/2.0.1' into 'stable'rinpatch
2.0.1 release See merge request pleroma/pleroma!2298
2020-03-16CHANGELOG.md: Add upgrade notes for 2.0.1rinpatch
2020-03-16CHANGELOG.md: Add remaining entries for 2.0.1rinpatch
2020-03-16static-fe tests: fix to work on stablerinpatch
2020-03-16rate limiter: disable based on if remote ip was found, not on if the plug ↵rinpatch
was enabled The current rate limiter disable logic won't trigger when the remote ip is not forwarded, only when the remoteip plug is not enabled, which is not the case on most instances since it's enabled by default. This changes the behavior to warn and disable when the remote ip was not forwarded, even if the RemoteIP plug is enabled. Also closes #1620
2020-03-16rip 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-16Merge branch 'features/staticfe-sanitization' into 'develop'rinpatch
static_fe: Sanitize HTML Closes #1614 See merge request pleroma/pleroma!2299
2020-03-15Merge branch 'bugfix/earmark_renderer_test' into 'develop'rinpatch
test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex See merge request pleroma/pleroma!2300
2020-03-15Merge branch 'features/staticfe-sanitization' into 'develop'rinpatch
static_fe: Sanitize HTML Closes #1614 See merge request pleroma/pleroma!2299
2020-03-15static_fe: Sanitize HTML in usersHaelwenn (lanodan) Monnier
2020-03-15mix.lock: [minor] last hash appendedHaelwenn (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-15test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.exHaelwenn (lanodan) Monnier
Wasn't in the test suite otherwise
2020-03-15changelog.md: add 2.0.1 entryrinpatch
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-15pleroma_api_controller.ex: Improve conversations error reportingHaelwenn (lanodan) Monnier
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
2020-03-15Update AdminFEMark Felder
2020-03-15Merge branch 'fix/cache-control-headers' into 'develop'rinpatch
Fix Cache Control headers on media See merge request pleroma/pleroma!2295
2020-03-15auth_controller.ex: Add admin scope to MastoFEHaelwenn (lanodan) Monnier
Related: https://git.pleroma.social/pleroma/pleroma/issues/1265
2020-03-15pleroma_api.md: direct_conversation_id vs. conversation_idHaelwenn (lanodan) Monnier
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
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
It moves bbcode to bbcode_pleroma as the former is owned by kaniini and transfering ownership wasn't done in a timely manner. Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374 Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
2020-03-15Revert "Set better Cache-Control header for static content"rinpatch
On furher investigation it seems like all that did was cause unintuitive behavior. The emoji request flood that was the reason for introducing it isn't really that big of a deal either, since Plug.Static only needs to read file modification time and size to determine the ETag. Closes #1613
2020-03-15Merge branch 'docs/new_user' into 'develop'rinpatch
CLI_tasks/user.md: Fix `pleroma.user new` documentation Closes #1621 See merge request pleroma/pleroma!2286
2020-03-15Merge branch 'fix/signup-without-email' into 'develop'feld
Allow account registration without an email See merge request pleroma/pleroma!2246
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-12 02:16:11 +0000