Commit Graph

8763 Commits (d63dca8d99196c91dc3e20e2d27f61ea753b84af)
 

Author SHA1 Message Date
lain d63dca8d99 Merge branch 'feature/1635-notifications-include-types' into 'develop'
5 years ago
Alexander Strizhakov 98a60df41f
include_types parameter in /api/v1/notifications
5 years ago
lain 952cb589f4 Merge branch 'fix-testing' into 'develop'
5 years ago
stwf a8c6933ca0 remove federated testing
5 years ago
rinpatch 69341cbcba Merge branch 'feature/1530-removing-with_move' into 'develop'
5 years ago
Haelwenn e4380afc18 Merge branch 'docs/mrf_object_age' into 'develop'
5 years ago
Alexander Strizhakov f3791add99
removing with_move parameter
5 years ago
Mark Felder 8dd01b24d2 Improve documentation of mrf_object_age
5 years ago
rinpatch b80958d4e3 Merge branch 'feat/templates' into 'develop'
5 years ago
rinpatch 7829de6da4 gitlab: create templates for bug reports and release MRs
5 years ago
rinpatch ac5c2b66b9 Merge branch 'fix-warnings-in-tests' into 'develop'
5 years ago
Alexander Strizhakov dc2ec84c0f
warnings fix
5 years ago
rinpatch c2527b8c63 Merge branch 'removing-deprecated' into 'develop'
5 years ago
Alexander Strizhakov ba90a6d3e5
removing from descriptions.exs deprecated settings
5 years ago
rinpatch 34fd1c2c9d Merge branch 'bugfix/earmark_renderer_test' into 'develop'
5 years ago
rinpatch df2608ebf8 Merge branch 'features/staticfe-sanitization' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 8176ca9e40 static_fe: Sanitize HTML in users
5 years ago
Haelwenn (lanodan) Monnier acb016397e mix.lock: [minor] last hash appended
5 years ago
Haelwenn (lanodan) Monnier 0ac6e29654 static_fe: Sanitize HTML in posts
5 years ago
lain fa4ec17c84 Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
5 years ago
Haelwenn d84670b9e1 Merge branch 'f' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier dca21cd1d6 test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex
5 years ago
Haelwenn 67a27825b1 Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'
5 years ago
rinpatch e87a32bcd7 rip out fetch_initial_posts
5 years ago
rinpatch 85ac909160 Merge branch 'bugfix/pleroma_conversation_api' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 8f7bc07ebc pleroma_api_controller.ex: Improve conversations error reporting
5 years ago
Ivan Tashkinov ecb7809e92 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
rinpatch 14ebf8f1e5 Merge branch 'update/admin-fe-20200312' into 'develop'
5 years ago
rinpatch d88c8a9614 Merge branch 'fix/cache-control-headers' into 'develop'
5 years ago
rinpatch 6a28c198af uploaded media plug: do not inject compile-time params on every request
5 years ago
rinpatch 38f796a5c6 Merge branch 'feature/mastofe-admin-scope' into 'develop'
5 years ago
rinpatch 4db88242e5 Merge branch 'docs/direct_conversation_id' into 'develop'
5 years ago
Mark Felder 2966377cb9 Update AdminFE
5 years ago
rinpatch 994ac4357c Merge branch 'fix/hashtags-streaming' into 'develop'
5 years ago
rinpatch 658f30c0b3 Merge branch 'static-accept-missing' into 'develop'
5 years ago
rinpatch fc4496d4fa rate limiter: disable based on if remote ip was found, not on if the plug was enabled
5 years ago
rinpatch 3e0f05f08e Merge branch 'bugfix/br-vs-newline' into 'develop'
5 years ago
Mark Felder c6eb1c1b92 Merge branch 'develop' into fix/cache-control-headers
5 years ago
Mark Felder 7321429a2e Lint
5 years ago
Mark Felder 3b1b183b42 Synchronize cache-control header for local media with the mediaproxy
5 years ago
Mark Felder db36b48180 Remove test verifying we preserve cache-control headers; we don't
5 years ago
Mark Felder 470090471d Fix test to use new cache-control settings
5 years ago
Mark Felder 413177c8f0 Set correct Cache-Control header for local media
5 years ago
Mark Felder c62195127d Update comment to reflect what the code is actually doing
5 years ago
Mark Felder e04e16bbc0 Do not strip Cache-Control headers from media. Trust the Pleroma backend.
5 years ago
Mark Felder ad31d0726a Do not trust remote Cache-Control headers for mediaproxy
5 years ago
rinpatch 096c5c52e0 Merge branch 'revert/cache-control' into 'develop'
5 years ago
Egor Kislitsyn fffc382f13
Fix hashtags WebSocket streaming
5 years ago
Haelwenn (lanodan) Monnier d1379c4de8
Formatting: Do not use \n and prefer <br> instead
5 years ago
feld 802b991814 Merge branch 'exclude-posts-visible-to-admin' into 'develop'
5 years ago