Ben Irvin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ea684e159a 
							
						 
					 
					
						
						
							
							Merge branch 'main' into chore/replace-node-14-with-20  
						
						
						
						
					 
					
						2023-07-24 16:33:10 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Roig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							df79981a07 
							
						 
					 
					
						
						
							
							Merge pull request  #17262  from strapi/fix/relation-reordering-inv  
						
						
						
						
					 
					
						2023-07-24 15:12:00 +02:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
						
						
							
						
						
							e1e177976a 
							
						 
					 
					
						
						
							
							allow defaultRole to be nullable  
						
						
						
						
					 
					
						2023-07-20 11:36:23 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Roig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c3e1892955 
							
						 
					 
					
						
						
							
							Merge pull request  #17384  from strapi/fix/ct-rw-assign-concurrency  
						
						
						
						
					 
					
						2023-07-20 11:12:50 +02:00 
						 
				 
			
				
					
						
							
							
								Marc-Roig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3d6bb325e1 
							
						 
					 
					
						
						
							
							test: concurrent content type updates  
						
						
						
						
					 
					
						2023-07-20 08:06:32 +02:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0fff4223ad 
							
						 
					 
					
						
						
							
							Merge branch 'main' into fix/17172-ssolocked-roles-null  
						
						
						
						
					 
					
						2023-07-19 10:59:22 +02:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
						
						
							
						
						
							dda8543003 
							
						 
					 
					
						
						
							
							fix defaultRole and comment  
						
						
						
						
					 
					
						2023-07-18 17:48:07 +02:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
						
						
							
						
						
							88f99a54f7 
							
						 
					 
					
						
						
							
							Revert "fix defaultRole and comment"  
						
						... 
						
						
						
						This reverts commit f33ad9cc2966f3de465426c7be45d16aa874159b. 
						
						
					 
					
						2023-07-18 17:40:11 +02:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
						
						
							
						
						
							ae67e82f26 
							
						 
					 
					
						
						
							
							Revert "allow null defaultRole on backend"  
						
						... 
						
						
						
						This reverts commit 64c995d4ccf5681bac9b10e575ce808f6e17d120. 
						
						
					 
					
						2023-07-18 17:37:13 +02:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
						
						
							
						
						
							64c995d4cc 
							
						 
					 
					
						
						
							
							allow null defaultRole on backend  
						
						
						
						
					 
					
						2023-07-18 17:32:51 +02:00 
						 
				 
			
				
					
						
							
							
								Gustav Hansen 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							670bf497cb 
							
						 
					 
					
						
						
							
							Merge pull request  #17350  from strapi/feature/review-workflow-multiple-merge-18-07-23  
						
						... 
						
						
						
						Merge `main` into `feature/review-workflow-multiple` (including bulk publish) 
						
						
					 
					
						2023-07-18 15:35:54 +02:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
						
						
							
						
						
							f33ad9cc29 
							
						 
					 
					
						
						
							
							fix defaultRole and comment  
						
						
						
						
					 
					
						2023-07-18 13:26:22 +02:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
						
						
							
						
						
							52b740ebee 
							
						 
					 
					
						
						
							
							add provider options tests  
						
						
						
						
					 
					
						2023-07-18 13:22:20 +02:00 
						 
				 
			
				
					
						
							
							
								Gustav Hansen 
							
						 
					 
					
						
						
						
						
							
						
						
							a6d17cebb9 
							
						 
					 
					
						
						
							
							Merge branch 'main' into feature/review-workflow-multiple-merge-18-07-23  
						
						
						
						
					 
					
						2023-07-18 13:05:31 +02:00 
						 
				 
			
				
					
						
							
							
								Marc-Roig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							dd992c962b 
							
						 
					 
					
						
						
							
							fix: test add content types when creating workflow  
						
						
						
						
					 
					
						2023-07-18 12:34:01 +02:00 
						 
				 
			
				
					
						
							
							
								markkaylor 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a82de46746 
							
						 
					 
					
						
						
							
							feature/bulk-publish-v2 ( #17185 )  
						
						... 
						
						
						
						Co-authored-by: Simone <simone.taeggi@strapi.io>
Co-authored-by: markkaylor <mark.kaylor@strapi.io>
Co-authored-by: Josh <37798644+joshuaellis@users.noreply.github.com>
Co-authored-by: Rémi de Juvigny <remi.dejuvigny@strapi.io>
Co-authored-by: Fernando Chavez <fernando.chavez@strapi.io> 
						
						
					 
					
						2023-07-18 09:03:55 +02:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
						
						
							
						
						
							5d61fd85e5 
							
						 
					 
					
						
						
							
							fix order  
						
						
						
						
					 
					
						2023-07-17 15:24:15 +02:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
						
						
							
						
						
							2c221dc53f 
							
						 
					 
					
						
						
							
							simplify sorting  
						
						
						
						
					 
					
						2023-07-17 15:21:29 +02:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
						
						
							
						
						
							0e451991f4 
							
						 
					 
					
						
						
							
							fix test by allowing results to come unsorted  
						
						
						
						
					 
					
						2023-07-17 15:08:44 +02:00 
						 
				 
			
				
					
						
							
							
								Gustav Hansen 
							
						 
					 
					
						
						
						
						
							
						
						
							72cc277165 
							
						 
					 
					
						
						
							
							Merge branch 'main' into feature/review-workflow-multiple-merge-17-07-23  
						
						
						
						
					 
					
						2023-07-17 13:38:35 +02:00 
						 
				 
			
				
					
						
							
							
								Marc-Roig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c944d6f50b 
							
						 
					 
					
						
						
							
							fix: workflow creating in integration test  
						
						
						
						
					 
					
						2023-07-17 12:02:29 +02:00 
						 
				 
			
				
					
						
							
							
								Marc-Roig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cbe131711e 
							
						 
					 
					
						
						
							
							test: you can not create a workflow with duplicated stage names  
						
						
						
						
					 
					
						2023-07-17 11:16:56 +02:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7a64e2a7fd 
							
						 
					 
					
						
						
							
							Merge branch 'main' into chore/replace-node-14-with-20  
						
						
						
						
					 
					
						2023-07-17 09:15:55 +02:00 
						 
				 
			
				
					
						
							
							
								Marc-Roig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a887260621 
							
						 
					 
					
						
						
							
							fix: split relations test file, as tests were doing too many requests  
						
						
						
						
					 
					
						2023-07-14 11:21:28 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							68528a363e 
							
						 
					 
					
						
						
							
							Fix bulkDelete not found should return a count of 0  
						
						
						
						
					 
					
						2023-07-12 17:15:12 +02:00 
						 
				 
			
				
					
						
							
							
								Marc-Roig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2d63671daa 
							
						 
					 
					
						
						
							
							fix: relations test relation disconnect breaking other relations  
						
						
						
						
					 
					
						2023-07-12 09:43:27 +02:00 
						 
				 
			
				
					
						
							
							
								Marc-Roig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ee2cd841c9 
							
						 
					 
					
						
						
							
							tests: updating entity relations does not break other relations  
						
						
						
						
					 
					
						2023-07-11 15:37:54 +02:00 
						 
				 
			
				
					
						
							
							
								Gustav Hansen 
							
						 
					 
					
						
						
						
						
							
						
						
							a886c69b56 
							
						 
					 
					
						
						
							
							Merge branch 'main' into feature/review-workflow-multiple-merge-07-2023  
						
						
						
						
					 
					
						2023-07-07 13:35:15 +02:00 
						 
				 
			
				
					
						
							
							
								nathan-pichon 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							05a46a71f2 
							
						 
					 
					
						
						
							
							fix(review-workflows): remove workflow validation in stage service  
						
						
						
						
					 
					
						2023-07-05 10:35:02 +02:00 
						 
				 
			
				
					
						
							
							
								nathan-pichon 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							30ff81ecbc 
							
						 
					 
					
						
						
							
							chore(review-workflows): remove useless console.log  
						
						
						
						
					 
					
						2023-07-05 10:35:02 +02:00 
						 
				 
			
				
					
						
							
							
								Marc-Roig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							62be7cabe6 
							
						 
					 
					
						
						
							
							test: count meta  
						
						
						
						
					 
					
						2023-07-04 17:26:33 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre BODIN 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							028f543e81 
							
						 
					 
					
						
						
							
							Merge branch 'main' into chore/replace-node-14-with-20  
						
						
						
						
					 
					
						2023-07-01 06:56:07 +02:00 
						 
				 
			
				
					
						
							
							
								Ben Irvin 
							
						 
					 
					
						
						
						
						
							
						
						
							298bb0d573 
							
						 
					 
					
						
						
							
							ignore strapi.destroy error in test  
						
						
						
						
					 
					
						2023-06-28 10:55:57 +02:00 
						 
				 
			
				
					
						
							
							
								Marc-Roig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							65294d29a4 
							
						 
					 
					
						
						
							
							test: publish entity with required component  
						
						
						
						
					 
					
						2023-06-27 10:23:40 +02:00 
						 
				 
			
				
					
						
							
							
								nathan-pichon 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e72ca4b13c 
							
						 
					 
					
						
						
							
							test(review-workflow): refresh data between tests  
						
						
						
						
					 
					
						2023-06-23 14:26:49 +02:00 
						 
				 
			
				
					
						
							
							
								Gustav Hansen 
							
						 
					 
					
						
						
						
						
							
						
						
							4410fb8f97 
							
						 
					 
					
						
						
							
							Merge branch 'main' into feature/review-workflow-multiple-merge-main  
						
						
						
						
					 
					
						2023-06-22 12:17:05 +02:00 
						 
				 
			
				
					
						
							
							
								Gustav Hansen 
							
						 
					 
					
						
						
						
						
							
						
						
							7b83703576 
							
						 
					 
					
						
						
							
							Merge branch 'main' into feature/review-workflow-multiple-merge-main  
						
						
						
						
					 
					
						2023-06-22 11:20:53 +02:00 
						 
				 
			
				
					
						
							
							
								Marc-Roig 
							
						 
					 
					
						
						
						
						
							
						
						
							0654f395cd 
							
						 
					 
					
						
						
							
							test: use entity service to load relations  
						
						
						
						
					 
					
						2023-06-22 08:12:20 +01:00 
						 
				 
			
				
					
						
							
							
								Marc-Roig 
							
						 
					 
					
						
						
						
						
							
						
						
							e2fa85f848 
							
						 
					 
					
						
						
							
							skip cloning relations tests  
						
						
						
						
					 
					
						2023-06-22 08:12:20 +01:00 
						 
				 
			
				
					
						
							
							
								Marc-Roig 
							
						 
					 
					
						
						
						
						
							
						
						
							bf324d0557 
							
						 
					 
					
						
						
							
							test: skip relations test  
						
						... 
						
						
						
						see if it fixes flakey tests 
						
						
					 
					
						2023-06-22 08:12:20 +01:00 
						 
				 
			
				
					
						
							
							
								Marc 
							
						 
					 
					
						
						
						
						
							
						
						
							674dc96b89 
							
						 
					 
					
						
						
							
							refactor: mark uid as a prohibited field & separate auto-clone route ( #16957 )  
						
						... 
						
						
						
						Co-authored-by: Josh <37798644+joshuaellis@users.noreply.github.com> 
						
						
					 
					
						2023-06-22 08:12:20 +01:00 
						 
				 
			
				
					
						
							
							
								Marc 
							
						 
					 
					
						
						
						
						
							
						
						
							21498fbda7 
							
						 
					 
					
						
						
							
							test: set and disconnect should not steal from one to X relations  
						
						
						
						
					 
					
						2023-06-22 08:00:14 +01:00 
						 
				 
			
				
					
						
							
							
								Marc-Roig 
							
						 
					 
					
						
						
						
						
							
						
						
							2ac90b8e8e 
							
						 
					 
					
						
						
							
							test: disconnect and clone relations  
						
						
						
						
					 
					
						2023-06-22 07:59:49 +01:00 
						 
				 
			
				
					
						
							
							
								Marc-Roig 
							
						 
					 
					
						
						
						
						
							
						
						
							19f9273e7d 
							
						 
					 
					
						
						
							
							test clone components  
						
						
						
						
					 
					
						2023-06-22 07:59:49 +01:00 
						 
				 
			
				
					
						
							
							
								Marc-Roig 
							
						 
					 
					
						
						
						
						
							
						
						
							52bf461b06 
							
						 
					 
					
						
						
							
							test clone dynamic zones  
						
						
						
						
					 
					
						2023-06-22 07:59:49 +01:00 
						 
				 
			
				
					
						
							
							
								Marc-Roig 
							
						 
					 
					
						
						
						
						
							
						
						
							d90a0c34bb 
							
						 
					 
					
						
						
							
							test clone  
						
						
						
						
					 
					
						2023-06-22 07:59:49 +01:00 
						 
				 
			
				
					
						
							
							
								Marc-Roig 
							
						 
					 
					
						
						
						
						
							
						
						
							8982eea28e 
							
						 
					 
					
						
						
							
							test clone relations  
						
						
						
						
					 
					
						2023-06-22 07:59:49 +01:00 
						 
				 
			
				
					
						
							
							
								Nathan Pichon 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cd08c590a8 
							
						 
					 
					
						
						
							
							fix(review-workflow): the feature shouldn't be deactivated on content type creation ( #17045 )  
						
						... 
						
						
						
						* fix(reviewWorkflows): should not set review workflows as false on CT creation
* fix(reviewWorkflows): remove check on boolean to inject the stage attribute
* feat(reviewWorkflows): let people be able to deactivate rw stage attr
- without touching the old boolean for retro-compat 
						
						
					 
					
						2023-06-21 18:09:16 +02:00 
						 
				 
			
				
					
						
							
							
								Nathan Pichon 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e4e2a310e2 
							
						 
					 
					
						
						
							
							fix(review-workflows): display review workflows informations in content-manager when needed ( #16919 )  
						
						... 
						
						
						
						* chore: update example schemas
* fix(content-manager): merge data instead of overwrite nested objects
* feat(content-manager): add options object in the configuration object
* feat(review-workflow): add the review workflows option in the configuration of content-manager
* fix(content-manager): use review workflows option value in edit-view
* test(workflows): update mocks
* test(info-box): update mocks
* chore: add comments for utils in content-manager
* test(content-manager): add tests on content-types service
* fix(review-workflows): merge configuration before updating it
* docs(review-workflows): add comments about why we merge configuration of CTs
* refactor(review-workflows): extract updateContentTypeConfig function
* test(workflows): update mock
* fix(review-workflows): remove infinite loop
* fix(review-workflows): use findConfiguration instead of getConfiguration
* test(review-workflows): change plural name of long content type
* test(review-workflows): skip long ct name test 
						
						
					 
					
						2023-06-12 10:52:52 +02:00 
						 
				 
			
				
					
						
							
							
								Marc-Roig 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7ad44c8699 
							
						 
					 
					
						
						
							
							Merge branch 'main' into fix/rbac-condition-and-relations  
						
						
						
						
					 
					
						2023-06-09 10:32:42 +02:00