Josh 
							
						 
					 
					
						
						
						
						
							
						
						
							1ec998ff84 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into v5/main  
						
						
						
						
					 
					
						2024-01-26 08:31:31 +00:00 
						 
				 
			
				
					
						
							
							
								Rémi de Juvigny 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							df4560117a 
							
						 
					 
					
						
						
							
							Merge branch 'v5/main' into v5/history  
						
						
						
						
					 
					
						2024-01-24 17:40:04 +01:00 
						 
				 
			
				
					
						
							
							
								Convly 
							
						 
					 
					
						
						
						
						
							
						
						
							beec786491 
							
						 
					 
					
						
						
							
							v4.19.0  
						
						
						
						
					 
					
						2024-01-24 16:00:22 +01:00 
						 
				 
			
				
					
						
							
							
								Rémi de Juvigny 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							18b28ce2ee 
							
						 
					 
					
						
						
							
							chore: set up content history files ( #19298 )  
						
						... 
						
						
						
						* setup history server files
* add admin files
* chore: remove dedicated lifecycle files 
						
						
					 
					
						2024-01-23 18:15:34 +01:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
						
						
							
						
						
							9469280178 
							
						 
					 
					
						
						
							
							enhancement: refactor env-only values into configuration  
						
						
						
						
					 
					
						2024-01-17 15:59:25 +01:00 
						 
				 
			
				
					
						
							
							
								Josh 
							
						 
					 
					
						
						
						
						
							
						
						
							316470cdf8 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into v5/main  
						
						
						
						
					 
					
						2024-01-16 17:46:26 +00:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							38298e9ebd 
							
						 
					 
					
						
						
							
							Merge branch 'releases/4.17.1' into develop  
						
						
						
						
					 
					
						2024-01-16 17:24:48 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							8f2c1c1fef 
							
						 
					 
					
						
						
							
							v4.17.1  
						
						
						
						
					 
					
						2024-01-16 11:50:41 +01:00 
						 
				 
			
				
					
						
							
							
								Josh 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cc1043c512 
							
						 
					 
					
						
						
							
							feat: update to react-router-dom@6 ( #19184 )  
						
						
						
						
					 
					
						2024-01-15 11:13:36 +00:00 
						 
				 
			
				
					
						
							
							
								Josh 
							
						 
					 
					
						
						
						
						
							
						
						
							d402c40cae 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into v5/main  
						
						
						
						
					 
					
						2024-01-11 15:52:47 +00:00 
						 
				 
			
				
					
						
							
							
								Josh 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a3690b16a3 
							
						 
					 
					
						
						
							
							feat: add vite ( #18697 )  
						
						... 
						
						
						
						* feat: add vite
* fix: CheckPagePermissions was buggy
* fix: vite CJS warning & double print of experimental message
* chore: move to use plugins-workspace folder
* chore: update deps
---------
Co-authored-by: Paul <45032974+hide-me@users.noreply.github.com> 
						
						
					 
					
						2024-01-11 14:14:25 +00:00 
						 
				 
			
				
					
						
							
							
								Josh 
							
						 
					 
					
						
						
						
						
							
						
						
							f324494fe9 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into v5/main  
						
						
						
						
					 
					
						2024-01-10 15:58:45 +00:00 
						 
				 
			
				
					
						
							
							
								Mark Kaylor 
							
						 
					 
					
						
						
						
						
							
						
						
							07112073ac 
							
						 
					 
					
						
						
							
							v4.17.0  
						
						
						
						
					 
					
						2024-01-10 14:46:39 +01:00 
						 
				 
			
				
					
						
							
							
								Josh 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8aac0893a9 
							
						 
					 
					
						
						
							
							chore: update ds 1.14.1 ( #19179 )  
						
						
						
						
					 
					
						2024-01-09 11:40:22 +00:00 
						 
				 
			
				
					
						
							
							
								Rémi de Juvigny 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							25d2a8ffa1 
							
						 
					 
					
						
						
							
							fix: display nested components in edit view ( #19160 )  
						
						... 
						
						
						
						* add nested component in getstarted dz
* fix: display nested components in edit view
* chore: add comment 
						
						
					 
					
						2024-01-05 13:50:10 +00:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3a87f3cd99 
							
						 
					 
					
						
						
							
							enh: add types for project configuration files  
						
						... 
						
						
						
						Add types for project configuration files
Co-authored-by: Bassel Kanso <basselkanso82@gmail.com>
Co-authored-by: Christian Capeans <christiancp100@gmail.com>
Co-authored-by: Christian <christian.capeans.perez@strapi.io> 
						
						
					 
					
						2024-01-05 10:36:54 +01:00 
						 
				 
			
				
					
						
							
							
								Josh 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							966723fe56 
							
						 
					 
					
						
						
							
							chore: update ds to 1.14.0 ( #19138 )  
						
						
						
						
					 
					
						2024-01-03 10:06:15 +00:00 
						 
				 
			
				
					
						
							
							
								Josh 
							
						 
					 
					
						
						
						
						
							
						
						
							ddbb55f2eb 
							
						 
					 
					
						
						
							
							Merge branch 'main' into releases/4.17.0  
						
						
						
						
					 
					
						2024-01-02 13:41:57 +00:00 
						 
				 
			
				
					
						
							
							
								Convly 
							
						 
					 
					
						
						
						
						
							
						
						
							b887f1aa47 
							
						 
					 
					
						
						
							
							v4.16.2  
						
						
						
						
					 
					
						2023-12-21 15:53:18 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Kaylor 
							
						 
					 
					
						
						
						
						
							
						
						
							af13d4e056 
							
						 
					 
					
						
						
							
							v4.16.1  
						
						
						
						
					 
					
						2023-12-21 15:23:45 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Kaylor 
							
						 
					 
					
						
						
						
						
							
						
						
							b8acb528cd 
							
						 
					 
					
						
						
							
							v4.16.0  
						
						
						
						
					 
					
						2023-12-20 15:52:24 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Kaylor 
							
						 
					 
					
						
						
						
						
							
						
						
							24e6b11e8e 
							
						 
					 
					
						
						
							
							Merge branch 'main' of github.com:strapi/strapi into feature/content-releases  
						
						
						
						
					 
					
						2023-12-08 14:07:43 +01:00 
						 
				 
			
				
					
						
							
							
								Fernando Chávez 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							35f56a0444 
							
						 
					 
					
						
						
							
							feat(core): add feature flags ( #18871 )  
						
						... 
						
						
						
						Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
Co-authored-by: Josh <37798644+joshuaellis@users.noreply.github.com> 
						
						
					 
					
						2023-12-08 09:19:31 +01:00 
						 
				 
			
				
					
						
							
							
								Jen Tak 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5fc763775e 
							
						 
					 
					
						
						
							
							Register logger middleware before errors middleware ( #16921 )  
						
						... 
						
						
						
						In the examples and project templates the "errors" middleware which turn
thrown errors into HTTP responses is registered before the "logger"
middleware. This causes any errors thrown in controllers to pierce
through the logger middleware resulting in these requests not being
logged.
Eg. when a controller throws a ValidationError the resulting HTTP 400
request is not logged at all.
Change the order of middleware registration so that the logger is
'above' the errors middleware and has a chance to log *all* requests.
Co-authored-by: DMehaffy <derrickmehaffy@gmail.com> 
						
						
					 
					
						2023-12-05 09:28:41 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							83daf0117c 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into v5/main  
						
						
						
						
					 
					
						2023-12-01 10:29:48 +01:00 
						 
				 
			
				
					
						
							
							
								Josh 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3301d58a39 
							
						 
					 
					
						
						
							
							chore(deps): update DS to 1.13.2 ( #18959 )  
						
						... 
						
						
						
						* chore(deps): update DS to 1.13.2
* chore: update snapshots 
						
						
					 
					
						2023-11-30 16:37:04 +00:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							e0de993d4a 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into v5/main  
						
						
						
						
					 
					
						2023-11-30 16:42:36 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							6b35da10af 
							
						 
					 
					
						
						
							
							Merge branch 'main' into develop  
						
						
						
						
					 
					
						2023-11-30 16:32:56 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Kaylor 
							
						 
					 
					
						
						
						
						
							
						
						
							dc96169c3f 
							
						 
					 
					
						
						
							
							v4.15.5  
						
						
						
						
					 
					
						2023-11-29 16:42:28 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							27aa897cbb 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into v5/main  
						
						
						
						
					 
					
						2023-11-23 11:52:10 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							afe9e18254 
							
						 
					 
					
						
						
							
							v4.15.5-alpha.5  
						
						
						
						
					 
					
						2023-11-21 20:35:37 +01:00 
						 
				 
			
				
					
						
							
							
								Josh 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							306b218011 
							
						 
					 
					
						
						
							
							chore(examples): remove the generated types ( #18845 )  
						
						... 
						
						
						
						* chore(examples): remove the generated types
* chore(tooling): explicitly add generated types to root gitignore 
						
						
					 
					
						2023-11-20 09:26:53 +00:00 
						 
				 
			
				
					
						
							
							
								Josh 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							288794489a 
							
						 
					 
					
						
						
							
							chore(i18n): convert CMEditView components to TS ( #18831 )  
						
						
						
						
					 
					
						2023-11-20 08:41:17 +00:00 
						 
				 
			
				
					
						
							
							
								Josh 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a549feb253 
							
						 
					 
					
						
						
							
							chore: pretty codebase ( #18835 )  
						
						
						
						
					 
					
						2023-11-17 14:48:05 +00:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a96121ddeb 
							
						 
					 
					
						
						
							
							chore: Migrate CTB to typescript ( #18155 )  
						
						... 
						
						
						
						Co-authored-by: Bassel Kanso <basselkanso82@gmail.com>
Co-authored-by: Christian <christiancp100@gmail.com>
Co-authored-by: Jean-Sébastien Herbaux <Convly@users.noreply.github.com>
Co-authored-by: Christian <christian.capeans.perez@strapi.io>
Co-authored-by: Convly <jean-sebastien.herbaux@epitech.eu> 
						
						
					 
					
						2023-11-17 10:27:09 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							6a4fcc93af 
							
						 
					 
					
						
						
							
							v4.15.5-alpha.4  
						
						
						
						
					 
					
						2023-11-15 16:37:41 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							85efb4bfa3 
							
						 
					 
					
						
						
							
							v4.15.5-alpha.3  
						
						
						
						
					 
					
						2023-11-15 14:37:17 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							180e3acca9 
							
						 
					 
					
						
						
							
							v4.15.5-alpha.2  
						
						
						
						
					 
					
						2023-11-14 17:24:18 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							59aec6c474 
							
						 
					 
					
						
						
							
							v4.15.5-alpha.1  
						
						
						
						
					 
					
						2023-11-14 14:55:52 +01:00 
						 
				 
			
				
					
						
							
							
								Marc-Roig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9e388d8484 
							
						 
					 
					
						
						
							
							Merge branch 'main' into v5/main  
						
						
						
						
					 
					
						2023-11-14 10:14:39 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							8ac0ef5c42 
							
						 
					 
					
						
						
							
							fix(admin): load app custom with jsx and allow more extensions  
						
						
						
						
					 
					
						2023-11-13 19:21:11 +01:00 
						 
				 
			
				
					
						
							
							
								Josh 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2f026ea9b3 
							
						 
					 
					
						
						
							
							fix(admin): admin build errors ( #18764 ) ( #18770 )  
						
						... 
						
						
						
						* fix(admin): import & pass user customisations for admin panel
* fix(admin): modules should be resolved with module paths not system paths
* fix(admin): ensure webpack config is a type of function before calling, warn otherwise
* fix: convert the pluginPath to a system path before trying to resolve relative
* chore: update documentation 
						
						
					 
					
						2023-11-13 12:07:27 +00:00 
						 
				 
			
				
					
						
							
							
								Josh 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							175b72af9d 
							
						 
					 
					
						
						
							
							fix(admin): admin build errors ( #18764 )  
						
						... 
						
						
						
						* fix(admin): import & pass user customisations for admin panel
* fix(admin): modules should be resolved with module paths not system paths
* fix(admin): ensure webpack config is a type of function before calling, warn otherwise
* fix: convert the pluginPath to a system path before trying to resolve relative
* chore: update documentation 
						
						
					 
					
						2023-11-13 10:21:24 +00:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							da634b0951 
							
						 
					 
					
						
						
							
							v4.15.4  
						
						
						
						
					 
					
						2023-11-11 12:17:57 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							458516e434 
							
						 
					 
					
						
						
							
							v4.15.3  
						
						
						
						
					 
					
						2023-11-11 12:03:41 +01:00 
						 
				 
			
				
					
						
							
							
								Marc-Roig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8aca4eae6a 
							
						 
					 
					
						
						
							
							Merge branch 'main' into v5/main  
						
						
						
						
					 
					
						2023-11-09 12:13:13 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Kaylor 
							
						 
					 
					
						
						
						
						
							
						
						
							bb51089333 
							
						 
					 
					
						
						
							
							v4.15.2  
						
						
						
						
					 
					
						2023-11-08 16:27:10 +01:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							87431e44c3 
							
						 
					 
					
						
						
							
							feat: allow passing http serverOptions from config ( #18591 )  
						
						
						
						
					 
					
						2023-11-06 15:31:17 +01:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d6433aecec 
							
						 
					 
					
						
						
							
							chore: remove extraneous editorconfigs ( #18592 )  
						
						
						
						
					 
					
						2023-11-03 09:04:49 +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