8773 Commits (d74405fc1a27bb3d13f4ead2bc2369f23827a781)

 

All Branches   

Search

Author	SHA1	Message	Date
lain	d74405fc1a	Merge branch 'fix-feed-pagination' into 'develop' ... Fix for feed page pagination Closes #1605 See merge request pleroma/pleroma!2281	5 years ago
lain	d23e81903d	Merge branch 'clear-config-test-improvements' into 'develop' ... Improved in-test config management See merge request pleroma/pleroma!2312	5 years ago
Ivan Tashkinov	1c05f539aa	Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).	5 years ago
Ivan Tashkinov	0e27c274f4	Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements ... # Conflicts: # test/web/mastodon_api/controllers/account_controller_test.exs	5 years ago
lain	5efa5b0c4a	Merge branch 'feature/1206-restrict-unauthenticated' into 'develop' ... restrict_unauthenticated setting Closes #1206 See merge request pleroma/pleroma!2318	5 years ago
Alexander Strizhakov	fe15f0ba15	restrict_unauthenticated setting	5 years ago
lain	d63dca8d99	Merge branch 'feature/1635-notifications-include-types' into 'develop' ... include_types parameter in /api/v1/notifications Closes #1635 See merge request pleroma/pleroma!2311	5 years ago
Alexander Strizhakov	98a60df41f	include_types parameter in /api/v1/notifications	5 years ago
lain	952cb589f4	Merge branch 'fix-testing' into 'develop' ... Fix CI by temporarily removing federated testing See merge request pleroma/pleroma!2314	5 years ago
stwf	a8c6933ca0	remove federated testing	5 years ago
Ivan Tashkinov	ec3719f539	Improved in-test config management functions.	5 years ago
rinpatch	69341cbcba	Merge branch 'feature/1530-removing-with_move' into 'develop' ... Feature/1530 removing with move Closes #1530 See merge request pleroma/pleroma!2306	5 years ago
Haelwenn	e4380afc18	Merge branch 'docs/mrf_object_age' into 'develop' ... Improve documentation of mrf_object_age See merge request pleroma/pleroma!2305	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' ... gitlab: create templates for bug reports and release MRs See merge request pleroma/pleroma!2304	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' ... Warnings fix See merge request pleroma/pleroma!2303	5 years ago
Alexander Strizhakov	dc2ec84c0f	warnings fix	5 years ago
rinpatch	c2527b8c63	Merge branch 'removing-deprecated' into 'develop' ... Removing from descriptions.exs deprecated settings See merge request pleroma/pleroma!2302	5 years ago
Alexander Strizhakov	ba90a6d3e5	removing from descriptions.exs deprecated settings	5 years ago
Alexander Strizhakov	89e4b3ebbd	fix for content-type header for tag feed	5 years ago
Alexander Strizhakov	91870c8995	adding rss for user feed	5 years ago
Alexander Strizhakov	26e2076659	fix for feed page pagination	5 years ago
rinpatch	34fd1c2c9d	Merge branch 'bugfix/earmark_renderer_test' into 'develop' ... test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex See merge request pleroma/pleroma!2300	5 years ago
rinpatch	df2608ebf8	Merge branch 'features/staticfe-sanitization' into 'develop' ... static_fe: Sanitize HTML Closes #1614 See merge request pleroma/pleroma!2299	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 ... Note: Seems to have different sanitization with TwitterCard generator giving the following: <meta content=\"“alert(&#39;xss&#39;)”\" property=\"twitter:description\">	5 years ago
lain	fa4ec17c84	Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop' ... [#1560] Restricted AP- & OStatus-related routes for non-federating instances Closes #1560 See merge request pleroma/pleroma!2235	5 years ago
Haelwenn	d84670b9e1	Merge branch 'f' into 'develop' ... rip out fetch_initial_posts Closes #1422 and #1595 See merge request pleroma/pleroma!2297	5 years ago
Haelwenn (lanodan) Monnier	dca21cd1d6	test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex ... Wasn't in the test suite otherwise	5 years ago
Haelwenn	67a27825b1	Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop' ... 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	5 years ago
rinpatch	e87a32bcd7	rip out fetch_initial_posts ... 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	5 years ago
rinpatch	85ac909160	Merge branch 'bugfix/pleroma_conversation_api' into 'develop' ... pleroma_api_controller.ex: Improve conversations error reporting See merge request pleroma/pleroma!2264	5 years ago
Haelwenn (lanodan) Monnier	8f7bc07ebc	pleroma_api_controller.ex: Improve conversations error reporting ... Related: https://git.pleroma.social/pleroma/pleroma/issues/1594	5 years ago
Ivan Tashkinov	ecb7809e92	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions ... # Conflicts: # lib/pleroma/plugs/static_fe_plug.ex	5 years ago
rinpatch	14ebf8f1e5	Merge branch 'update/admin-fe-20200312' into 'develop' ... Update AdminFE See merge request pleroma/pleroma!2292	5 years ago
rinpatch	d88c8a9614	Merge branch 'fix/cache-control-headers' into 'develop' ... Fix Cache Control headers on media See merge request pleroma/pleroma!2295	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' ... auth_controller.ex: Add admin scope to MastoFE See merge request pleroma/pleroma!2256	5 years ago
rinpatch	4db88242e5	Merge branch 'docs/direct_conversation_id' into 'develop' ... pleroma_api.md: direct_conversation_id vs. conversation_id See merge request pleroma/pleroma!2263	5 years ago
Mark Felder	2966377cb9	Update AdminFE	5 years ago
rinpatch	994ac4357c	Merge branch 'fix/hashtags-streaming' into 'develop' ... Fix hashtags WebSocket streaming Closes #1593 See merge request pleroma/pleroma!2294	5 years ago
rinpatch	658f30c0b3	Merge branch 'static-accept-missing' into 'develop' ... Fix static FE plug to handle missing Accept header. See merge request pleroma/pleroma!2260	5 years ago
rinpatch	fc4496d4fa	rate limiter: disable based on if remote ip was found, not on if the plug 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	5 years ago
rinpatch	3e0f05f08e	Merge branch 'bugfix/br-vs-newline' into 'develop' ... Formatting: Do not use \n and prefer <br> instead Closes #1374 and #1375 See merge request pleroma/pleroma!2204	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