8801 Commits (51fc504705c1ab337b1202d6e407a9578e67a9e9)

 

All Branches   

Search

Author	SHA1	Message	Date
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
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' ... Revert "Set better Cache-Control header for static content" Closes #1613 See merge request pleroma/pleroma!2290	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 ... 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	5 years ago
feld	802b991814	Merge branch 'exclude-posts-visible-to-admin' into 'develop' ... Exclude private and direct statuses visible to the admin when using godmode Closes #1599 See merge request pleroma/pleroma!2272	5 years ago
Ivan Tashkinov	bd40880fa0	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions ... # Conflicts: # test/web/activity_pub/activity_pub_controller_test.exs	5 years ago
rinpatch	00d1752031	Merge branch 'docs/new_user' into 'develop' ... CLI_tasks/user.md: Fix `pleroma.user new` documentation Closes #1621 See merge request pleroma/pleroma!2286	5 years ago
feld	2019f3b3ff	Merge branch 'fix/signup-without-email' into 'develop' ... Allow account registration without an email See merge request pleroma/pleroma!2246	5 years ago
rinpatch	7cdabdc0df	Merge branch 'fix/1610-release-compilation-config-fix' into 'develop' ... Merging default release config on app start Closes #1610 See merge request pleroma/pleroma!2288	5 years ago
feld	f92c447bbc	Merge branch 'relay-list-change' into 'develop' ... Relay list shows hosts without accepted follow See merge request pleroma/pleroma!2240	5 years ago
rinpatch	c3b9fbd3a7	Revert "Set better Cache-Control header for static content" ... 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	5 years ago
Alexander Strizhakov	fce090c1de	using Pleroma.Config instead of ets	5 years ago
Alexander Strizhakov	193d67cde5	compile fix	5 years ago
Alexander Strizhakov	282a93554f	merging release default config on app start	5 years ago
Ivan Tashkinov	5b696a8ac1	[#1560] Enforced authentication for non-federating instances in StaticFEController.	5 years ago
rinpatch	9dbf493b65	Merge branch 'docs/debian-install' into 'develop' ... installation/otp_en.md: Fix pleroma.nginx target [deb] See merge request pleroma/pleroma!2280	5 years ago
Haelwenn (lanodan) Monnier	6316726a5f	CLI_tasks: Use manpage formatting conventions ... - [] for options - <> for mandatory arguments - foo ... when foo can be repeated [ci skip]	5 years ago
Haelwenn (lanodan) Monnier	a06104b9d5	CLI_tasks/user.md: Fix `pleroma.user new` documentation ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1621 [ci skip]	5 years ago
Haelwenn	8ad73445cd	Merge branch 'bugfix/bad-pleromafe-bundle' into 'develop' ... static-fe.css: Restore from before a65ee8ea See merge request pleroma/pleroma!2284	5 years ago
Ivan Tashkinov	972889550d	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions	5 years ago
Haelwenn (lanodan) Monnier	a747eb6df9	static-fe.css: Restore from before a65ee8ea ... Related: https://git.pleroma.social/pleroma/pleroma/issues/1616	5 years ago
lain	953aece848	Merge branch 'fix/post-length-validation' into 'develop' ... Fix enforcement of character limits Closes #1618 See merge request pleroma/pleroma!2283	5 years ago
Mark Felder	5af798f246	Fix enforcement of character limits	5 years ago
Haelwenn (lanodan) Monnier	d9134d4430	installation/otp_en.md: Fix pleroma.nginx target [deb] ... Needs to be backported to stable. Related: https://git.pleroma.social/pleroma/pleroma-support/issues/29	5 years ago
Ivan Tashkinov	5fc92deef3	[#1560] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.	5 years ago
lain	841e4e4d83	Merge branch 'patch-1' into 'develop' ... Better advice for vacuuming after restoring. See merge request pleroma/pleroma!2233	5 years ago
rinpatch	5b74976c8d	Merge branch 'chore/mix-version-bump' into 'develop' ... mix.exs: bump version to development one See merge request pleroma/pleroma!2279	5 years ago
rinpatch	86e7709a4d	mix.exs: bump version to development one	5 years ago
rinpatch	663e466067	Merge branch 'stable' into 'develop' ... Sync develop with stable Closes #1262, #1267, #1293, #1303, #1287, #1291, #1382, #1438, #1129, #1109, and #1606 See merge request pleroma/pleroma!2278	5 years ago
rinpatch	e8493431bf	Merge branch 'release/2.0.0' into 'stable' ... Release/2.0.0 See merge request pleroma/pleroma!2273	5 years ago
rinpatch	e7c49d51d7	pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6af	5 years ago
rinpatch	80ca06227a	Merge branch 'fix/moderation-log-crashes' into 'release/2.0.0' ... moderation log: fix improperly migrated data See merge request pleroma/pleroma!2277	5 years ago
rinpatch	6cf1958b02	moderation log: fix improperly migrated data ... Some of the actions used to have a user map as a subject, which was then changed to an array of user maps. However instead of migrating old data there was just a hack to transform it every time, moreover this hack didn't include all possible actions, which resulted in crashes. This commit fixes the crashes by introducing a proper database migration for old data. Closes #1606	5 years ago