summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-03-20fix for doubled path on importfix/1604-emoji-pathAlexander Strizhakov
2020-03-19Merge branch 'fix-testing' into 'develop'lain
2020-03-19remove federated testingstwf
2020-03-18Merge branch 'feature/1530-removing-with_move' into 'develop'rinpatch
2020-03-16Merge branch 'docs/mrf_object_age' into 'develop'Haelwenn
2020-03-16removing with_move parameterAlexander Strizhakov
2020-03-16Improve documentation of mrf_object_ageMark Felder
2020-03-16Merge branch 'feat/templates' into 'develop'rinpatch
2020-03-16gitlab: create templates for bug reports and release MRsrinpatch
2020-03-16Merge branch 'fix-warnings-in-tests' into 'develop'rinpatch
2020-03-16warnings fixAlexander Strizhakov
2020-03-16Merge branch 'removing-deprecated' into 'develop'rinpatch
2020-03-16removing from descriptions.exs deprecated settingsAlexander Strizhakov
2020-03-15Merge branch 'bugfix/earmark_renderer_test' into 'develop'rinpatch
2020-03-15Merge branch 'features/staticfe-sanitization' into 'develop'rinpatch
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
2020-03-15Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'lain
2020-03-15Merge branch 'f' into 'develop'Haelwenn
2020-03-15test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.exHaelwenn (lanodan) Monnier
2020-03-15Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'Haelwenn
2020-03-15rip out fetch_initial_postsrinpatch
2020-03-15Merge branch 'bugfix/pleroma_conversation_api' into 'develop'rinpatch
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 'update/admin-fe-20200312' into 'develop'rinpatch
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 'docs/direct_conversation_id' into 'develop'rinpatch
2020-03-13Update AdminFEMark Felder
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-13Remove test verifying we preserve cache-control headers; we don'tMark Felder
2020-03-13Fix test to use new cache-control settingsMark 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 strip Cache-Control headers from media. Trust the Pleroma backend.Mark 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
generated by cgit v1.2.3 (git 2.44.0) at 2024-04-25 06:23:01 +0000