Mark Kaylor 
							
						 
					 
					
						
						
						
						
							
						
						
							94657d7e77 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:strapi/strapi into chore/merge-develop-to-v5-main  
						
						
						
						
					 
					
						2024-06-06 17:03:30 +02:00 
						 
				 
			
				
					
						
							
							
								Jean-Sébastien Herbaux 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							adb9db5660 
							
						 
					 
					
						
						
							
							Fix: Query Validation in Files' Admin API ( #20389 )  
						
						... 
						
						
						
						Co-authored-by: Ben Irvin <ben.irvin@strapi.io> 
						
						
					 
					
						2024-06-05 15:47:11 +02:00 
						 
				 
			
				
					
						
							
							
								Convly 
							
						 
					 
					
						
						
						
						
							
						
						
							33413bf56c 
							
						 
					 
					
						
						
							
							fix: style  
						
						
						
						
					 
					
						2024-05-30 13:34:00 +02:00 
						 
				 
			
				
					
						
							
							
								Convly 
							
						 
					 
					
						
						
						
						
							
						
						
							481550a0d4 
							
						 
					 
					
						
						
							
							Merge branch 'refs/heads/develop' into v5/main  
						
						... 
						
						
						
						# Conflicts:
#	.github/actions/check-pr-status/package.json
#	docs/docs/docs/01-core/admin/05-features/authentication.md
#	docs/docusaurus.config.js
#	docs/yarn.lock
#	examples/getstarted/package.json
#	examples/kitchensink-ts/package.json
#	examples/kitchensink/package.json
#	examples/plugins/workspace-plugin/package.json
#	lerna.json
#	package.json
#	packages/admin-test-utils/package.json
#	packages/cli/create-strapi-app/package.json
#	packages/cli/create-strapi-starter/package.json
#	packages/cli/create-strapi/package.json
#	packages/core/admin/admin/src/App.tsx
#	packages/core/admin/admin/src/components/AuthenticatedApp.tsx
#	packages/core/admin/admin/src/components/Context.tsx
#	packages/core/admin/admin/src/components/LeftMenu.tsx
#	packages/core/admin/admin/src/components/PrivateRoute.tsx
#	packages/core/admin/admin/src/content-manager/pages/ListSettingsView/index.jsx
#	packages/core/admin/admin/src/content-manager/pages/ListView/components/BulkActions/PublishAction.tsx
#	packages/core/admin/admin/src/content-manager/pages/ListView/components/TableCells/CellContent.tsx
#	packages/core/admin/admin/src/features/Configuration.tsx
#	packages/core/admin/admin/src/index.ts
#	packages/core/admin/admin/src/pages/ProfilePage.tsx
#	packages/core/admin/admin/src/pages/UseCasePage.tsx
#	packages/core/admin/ee/server/src/services/metrics.ts
#	packages/core/admin/package.json
#	packages/core/admin/server/src/bootstrap.ts
#	packages/core/content-manager/package.json
#	packages/core/content-releases/admin/src/components/CMReleasesContainer.tsx
#	packages/core/content-releases/admin/src/components/ReleaseListCell.tsx
#	packages/core/content-releases/admin/src/index.ts
#	packages/core/content-releases/admin/src/pages/ReleaseDetailsPage.tsx
#	packages/core/content-releases/admin/src/pages/tests/ReleaseDetailsPage.test.tsx
#	packages/core/content-releases/admin/src/services/release.ts
#	packages/core/content-releases/package.json
#	packages/core/content-releases/server/src/controllers/release.ts
#	packages/core/content-type-builder/package.json
#	packages/core/core/.gitignore
#	packages/core/data-transfer/package.json
#	packages/core/database/package.json
#	packages/core/database/src/query/helpers/populate/apply.ts
#	packages/core/email/package.json
#	packages/core/helper-plugin/package.json
#	packages/core/permissions/package.json
#	packages/core/strapi/package.json
#	packages/core/types/package.json
#	packages/core/upload/admin/src/components/AssetDialog/BrowseStep/tests/__snapshots__/index.test.jsx.snap
#	packages/core/upload/admin/src/pages/App/ConfigureTheView/components/tests/__snapshots__/Settings.test.jsx.snap
#	packages/core/upload/admin/src/pages/App/ConfigureTheView/tests/__snapshots__/ConfigureTheView.test.jsx.snap
#	packages/core/upload/package.json
#	packages/core/upload/server/services/provider.js
#	packages/core/upload/server/services/upload.js
#	packages/core/upload/server/src/services/image-manipulation.ts
#	packages/core/upload/server/tsconfig.eslint.json
#	packages/core/utils/package.json
#	packages/generators/app/package.json
#	packages/generators/app/src/utils/db-client-dependencies.ts
#	packages/generators/generators/package.json
#	packages/plugins/cloud/package.json
#	packages/plugins/color-picker/package.json
#	packages/plugins/documentation/package.json
#	packages/plugins/graphql/package.json
#	packages/plugins/i18n/admin/src/components/LocaleListCell.tsx
#	packages/plugins/i18n/admin/src/contentReleasesHooks/releaseDetailsView.ts
#	packages/plugins/i18n/admin/src/index.ts
#	packages/plugins/i18n/package.json
#	packages/plugins/sentry/package.json
#	packages/plugins/users-permissions/package.json
#	packages/providers/email-amazon-ses/package.json
#	packages/providers/email-mailgun/package.json
#	packages/providers/email-nodemailer/package.json
#	packages/providers/email-sendgrid/package.json
#	packages/providers/email-sendmail/package.json
#	packages/providers/upload-aws-s3/package.json
#	packages/providers/upload-cloudinary/package.json
#	packages/providers/upload-local/package.json
#	packages/utils/api-tests/package.json
#	packages/utils/eslint-config-custom/package.json
#	packages/utils/logger/package.json
#	packages/utils/tsconfig/package.json
#	packages/utils/typescript/package.json
#	packages/utils/upgrade/LICENSE
#	packages/utils/upgrade/bin/upgrade.js
#	packages/utils/upgrade/package.json
#	packages/utils/upgrade/packup.config.ts
#	scripts/front/package.json
#	tests/e2e/constants.ts
#	tests/e2e/tests/content-releases/releases-page.spec.ts
#	yarn.lock 
						
						
					 
					
						2024-05-30 13:12:27 +02:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7a6d9a2b0e 
							
						 
					 
					
						
						
							
							enhancement!: validate input in content API create and update controllers  
						
						... 
						
						
						
						Co-authored-by: Jean-Sébastien Herbaux <Convly@users.noreply.github.com> 
						
						
					 
					
						2024-05-07 11:22:22 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre BODIN 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0742c5784d 
							
						 
					 
					
						
						
							
							enhancement: use file path in place of streams to optimize sharp fragmentation & libvips caching ( #20080 )  
						
						... 
						
						
						
						Co-authored-by: DMehaffy <derrickmehaffy@gmail.com> 
						
						
					 
					
						2024-04-17 16:27:48 +02:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							18019758d6 
							
						 
					 
					
						
						
							
							enhancement!: create sends 201 status code  
						
						
						
						
					 
					
						2024-04-15 14:03:47 +02:00 
						 
				 
			
				
					
						
							
							
								Josh 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bc71a96d76 
							
						 
					 
					
						
						
							
							chore(pack-up): remove from monorepo (v5) ( #20092 )  
						
						... 
						
						
						
						* chore(pack-up): remove from repo
* chore: type fixes
* chore: add suggestions to tighten types
Co-authored-by: Ben Irvin <ben.irvin@strapi.io>
---------
Co-authored-by: Ben Irvin <ben.irvin@strapi.io> 
						
						
					 
					
						2024-04-12 13:39:49 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							bf35cde68f 
							
						 
					 
					
						
						
							
							chore: update koa-body  
						
						
						
						
					 
					
						2024-04-03 22:48:48 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							55ae34e5dc 
							
						 
					 
					
						
						
							
							chore: introduce providers to simplify main class  
						
						
						
						
					 
					
						2024-04-03 14:24:15 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							eb61511884 
							
						 
					 
					
						
						
							
							chore: use strapi.service instead of strapi.admin.services  
						
						
						
						
					 
					
						2024-04-03 14:24:15 +02:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							791bc2c971 
							
						 
					 
					
						
						
							
							fix: validation of upload filename  
						
						
						
						
					 
					
						2024-04-03 09:13:44 +02:00 
						 
				 
			
				
					
						
							
							
								Josh 
							
						 
					 
					
						
						
						
						
							
						
						
							660b779c4c 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into v5/main  
						
						
						
						
					 
					
						2024-04-02 10:11:20 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Roig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ae6b92318c 
							
						 
					 
					
						
						
							
							fix: sanitize file name when uploading image ( #19913 )  
						
						
						
						
					 
					
						2024-03-27 09:47:35 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							3f6a8109ea 
							
						 
					 
					
						
						
							
							chore: introduce query-params service to remove strapi.global dep in utils  
						
						
						
						
					 
					
						2024-03-25 14:03:32 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							fed8ac1cb7 
							
						 
					 
					
						
						
							
							chore: remove usage of strapi global in traverse  
						
						
						
						
					 
					
						2024-03-25 08:52:10 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							e68afb0e1e 
							
						 
					 
					
						
						
							
							chore: inverse control of contentAPI sanitize & validate  
						
						
						
						
					 
					
						2024-03-21 22:26:41 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							a9db1e42c6 
							
						 
					 
					
						
						
							
							chore: migrate upload plugin to typescript  
						
						
						
						
					 
					
						2024-03-21 09:02:17 +01:00 
						 
				 
			
				
					
						
							
							
								Josh 
							
						 
					 
					
						
						
						
						
							
						
						
							7dc4206d08 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into v5/main  
						
						
						
						
					 
					
						2024-03-15 16:11:49 +00:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							a95285578b 
							
						 
					 
					
						
						
							
							chore: database enhancements  
						
						
						
						
					 
					
						2024-03-13 22:13:40 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							5ffb3c7100 
							
						 
					 
					
						
						
							
							chore: deprecate entity-service and delegate to document service  
						
						
						
						
					 
					
						2024-03-12 21:02:33 +01:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ab2af1e539 
							
						 
					 
					
						
						
							
							fix(core): use module uid for config namespace instead of dot notation  
						
						
						
						
					 
					
						2024-03-11 12:28:46 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							8d53207f8e 
							
						 
					 
					
						
						
							
							chore: remove template configuration from utils  
						
						
						
						
					 
					
						2024-03-09 13:08:41 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							4b8513e6df 
							
						 
					 
					
						
						
							
							chore: migration upload plugin  
						
						
						
						
					 
					
						2024-03-08 10:59:36 +01:00 
						 
				 
			
				
					
						
							
							
								Giulio Montagner 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							836f74517f 
							
						 
					 
					
						
						
							
							fix: add sizeInBytes on resized and optimized images ( #19707 )  
						
						
						
						
					 
					
						2024-03-07 18:31:55 +01:00 
						 
				 
			
				
					
						
							
							
								Josh 
							
						 
					 
					
						
						
						
						
							
						
						
							84b8d2ccd4 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into v5/main  
						
						
						
						
					 
					
						2024-02-28 16:01:39 +00:00 
						 
				 
			
				
					
						
							
							
								Giulio Montagner 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f8af92b375 
							
						 
					 
					
						
						
							
							fix: add sizeInBytes for upload providers ( #19593 )  
						
						
						
						
					 
					
						2024-02-23 11:37:26 +01:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							01dfca22b2 
							
						 
					 
					
						
						
							
							chore: remove deprecated isSupportedImage  
						
						
						
						
					 
					
						2024-01-18 11:50:21 +01:00 
						 
				 
			
				
					
						
							
							
								Marc-Roig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8aca4eae6a 
							
						 
					 
					
						
						
							
							Merge branch 'main' into v5/main  
						
						
						
						
					 
					
						2023-11-09 12:13:13 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre BODIN 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ae792fb42c 
							
						 
					 
					
						
						
							
							Release 4.15.1 ( #18646 )  
						
						... 
						
						
						
						Co-authored-by: Josh <37798644+joshuaellis@users.noreply.github.com>
Co-authored-by: Marc Roig <marc12info@gmail.com> 
						
						
					 
					
						2023-11-03 08:37:53 +01:00 
						 
				 
			
				
					
						
							
							
								Thanos 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							524af8055c 
							
						 
					 
					
						
						
							
							fix(upload): media library image signedUrl cache busting issue ( #18541 )  
						
						... 
						
						
						
						* media library image signedUrl cache busting issue references #18443 
* date query param typo
* add asset isUrlSigned property, used as asset url cache busting condition
* removed cacheBustUrl function, added inline comment to describe functionality 
						
						
					 
					
						2023-10-31 15:28:52 +00:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							0b5590b0eb 
							
						 
					 
					
						
						
							
							chore(core/strapi): extend container in strapi class  
						
						
						
						
					 
					
						2023-10-24 17:18:59 +01:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
						
						
							
						
						
							1a56693a91 
							
						 
					 
					
						
						
							
							cleanup  
						
						
						
						
					 
					
						2023-08-17 17:24:11 +02:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
						
						
							
						
						
							dd080bf280 
							
						 
					 
					
						
						
							
							fix missing sanitize  
						
						
						
						
					 
					
						2023-08-11 17:08:03 +02:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
						
						
							
						
						
							c1f0f87949 
							
						 
					 
					
						
						
							
							fix typo  
						
						
						
						
					 
					
						2023-08-11 17:04:11 +02:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
						
						
							
						
						
							dce86bec5c 
							
						 
					 
					
						
						
							
							validate does not sanitize  
						
						
						
						
					 
					
						2023-08-11 13:13:44 +02:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
						
						
							
						
						
							995473d959 
							
						 
					 
					
						
						
							
							add utils.validate and replace sanitize usage  
						
						
						
						
					 
					
						2023-08-10 15:24:35 +02:00 
						 
				 
			
				
					
						
							
							
								Marc-Roig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							007c289877 
							
						 
					 
					
						
						
							
							fix: typo  
						
						
						
						
					 
					
						2023-07-18 16:48:50 +02:00 
						 
				 
			
				
					
						
							
							
								Marc-Roig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							dc09aa2f8f 
							
						 
					 
					
						
						
							
							fix: move cron utils to upload  
						
						
						
						
					 
					
						2023-07-18 16:22:20 +02:00 
						 
				 
			
				
					
						
							
							
								Jamie Howard 
							
						 
					 
					
						
						
						
						
							
						
						
							1a8b6e78d8 
							
						 
					 
					
						
						
							
							feature(ee): WIP weekly cron job  
						
						
						
						
					 
					
						2023-07-13 15:03:23 +01:00 
						 
				 
			
				
					
						
							
							
								Jamie Howard 
							
						 
					 
					
						
						
						
						
							
						
						
							c53b7a7ae4 
							
						 
					 
					
						
						
							
							fix: simplify emitEvent logic  
						
						
						
						
					 
					
						2023-06-01 15:20:13 +01:00 
						 
				 
			
				
					
						
							
							
								Jamie Howard 
							
						 
					 
					
						
						
						
						
							
						
						
							9ecb8fe34c 
							
						 
					 
					
						
						
							
							test: fix tests for addAllowedEvent  
						
						
						
						
					 
					
						2023-05-31 14:28:32 +01:00 
						 
				 
			
				
					
						
							
							
								Jamie Howard 
							
						 
					 
					
						
						
						
						
							
						
						
							d77e42b859 
							
						 
					 
					
						
						
							
							refactor(webhooks): populate allowed events from relevant modules  
						
						
						
						
					 
					
						2023-05-30 16:13:10 +01:00 
						 
				 
			
				
					
						
							
							
								Jamie Howard 
							
						 
					 
					
						
						
						
						
							
						
						
							b919da9c26 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/main' into feature/set-webhook-events  
						
						
						
						
					 
					
						2023-05-30 10:16:36 +01:00 
						 
				 
			
				
					
						
							
							
								Marc 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4c13de458e 
							
						 
					 
					
						
						
							
							Merge pull request  #16518  from strapi/feature/private-s3-url-signing-content-api  
						
						
						
						
					 
					
						2023-05-29 14:57:06 +02:00 
						 
				 
			
				
					
						
							
							
								Jamie Howard 
							
						 
					 
					
						
						
						
						
							
						
						
							db767bded1 
							
						 
					 
					
						
						
							
							test(upload): bootstrap  
						
						
						
						
					 
					
						2023-05-25 13:30:24 +01:00 
						 
				 
			
				
					
						
							
							
								Jamie Howard 
							
						 
					 
					
						
						
						
						
							
						
						
							14ff035647 
							
						 
					 
					
						
						
							
							feature: replace emitEvent calls with new webhook store  
						
						
						
						
					 
					
						2023-05-25 12:37:38 +01:00 
						 
				 
			
				
					
						
							
							
								Jamie Howard 
							
						 
					 
					
						
						
						
						
							
						
						
							933a2e3dff 
							
						 
					 
					
						
						
							
							feature(upload): register webhook events  
						
						
						
						
					 
					
						2023-05-24 16:46:59 +01:00 
						 
				 
			
				
					
						
							
							
								Marc-Roig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							087ff3765b 
							
						 
					 
					
						
						
							
							chore: create util to check if folder is the same as another one or a child one  
						
						
						
						
					 
					
						2023-05-22 10:06:37 +02:00 
						 
				 
			
				
					
						
							
							
								Marc-Roig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4870920918 
							
						 
					 
					
						
						
							
							fix: improve path match on check if folder is movable  
						
						
						
						
					 
					
						2023-05-17 18:08:02 +02:00