Abdón Rodríguez Davila 
							
						 
					 
					
						
						
						
						
							
						
						
							187a669d1e 
							
						 
					 
					
						
						
							
							Merge branch 'master' into eslint-update  
						
						... 
						
						
						
						# Conflicts:
#	.eslintrc.js
#	package.json
#	packages/strapi-admin/admin/src/containers/HomePage/CommunityContent.js
#	packages/strapi-admin/admin/src/containers/HomePage/WelcomeContent.js
#	packages/strapi-helper-plugin/lib/src/components/InputTextWithErrors/index.js
#	packages/strapi-hook-bookshelf/lib/index.js
#	packages/strapi-hook-bookshelf/lib/utils/graphql.js
#	packages/strapi-hook-bookshelf/lib/utils/index.js
#	packages/strapi-plugin-content-manager/admin/src/components/FilterOptions/InputWithAutoFocus.js
#	packages/strapi-plugin-content-manager/admin/src/components/SelectMany/index.js
#	packages/strapi-plugin-content-manager/admin/src/components/SelectOne/index.js
#	packages/strapi-plugin-content-manager/admin/src/components/TableHeader/index.js
#	packages/strapi-plugin-content-manager/admin/src/containers/ListPage/index.js
#	packages/strapi-plugin-content-manager/admin/src/containers/SettingPage/index.js
#	packages/strapi-plugin-content-manager/config/policies/routing.js
#	packages/strapi-plugin-content-manager/services/ContentManager.js
#	packages/strapi-plugin-content-type-builder/admin/src/components/TableListRow/index.js
#	packages/strapi-plugin-content-type-builder/admin/src/containers/AttributesPickerModal/index.js
#	packages/strapi-utils/lib/models.js
#	yarn.lock 
						
						
					 
					
						2019-09-09 15:26:35 +02:00 
						 
				 
			
				
					
						
							
							
								Abdón Rodríguez Davila 
							
						 
					 
					
						
						
						
						
							
						
						
							21a14ee737 
							
						 
					 
					
						
						
							
							Remove definitions for rules were not found  
						
						
						
						
					 
					
						2019-08-28 12:20:27 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							60d04d26eb 
							
						 
					 
					
						
						
							
							Init group tests and fix some groups issues  
						
						
						
						
					 
					
						2019-08-08 14:30:43 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							93c7f63cd1 
							
						 
					 
					
						
						
							
							Add email tests  
						
						
						
						
					 
					
						2019-08-08 14:30:43 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							35d22e2c85 
							
						 
					 
					
						
						
							
							Init password tests and split in separate test files  
						
						
						
						
					 
					
						2019-08-08 14:30:42 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							bb036333a2 
							
						 
					 
					
						
						
							
							Init upload plugin e2e tests  
						
						
						
						
					 
					
						2019-08-06 10:46:53 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							c17a718f25 
							
						 
					 
					
						
						
							
							Handle date with iso format in input and output to simplify processing  
						
						
						
						
					 
					
						2019-08-05 16:55:17 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							c5e50665cd 
							
						 
					 
					
						
						
							
							Add upload route in content-manager and remove formdata for data creation  
						
						
						
						
					 
					
						2019-07-30 16:58:36 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							8e8433662b 
							
						 
					 
					
						
						
							
							rename wysiwyg type to richtext for future plans  
						
						
						
						
					 
					
						2019-07-29 18:05:18 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							1dea89ca8f 
							
						 
					 
					
						
						
							
							Support type wysiwyg instead of appearance param  
						
						
						
						
					 
					
						2019-07-23 13:36:06 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							254e6b9c38 
							
						 
					 
					
						
						
							
							Use appName to name the test app package.json  
						
						
						
						
					 
					
						2019-07-18 17:21:53 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							91d1ca6763 
							
						 
					 
					
						
						
							
							parse argv if --db params used  
						
						
						
						
					 
					
						2019-07-18 16:56:49 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							574b24b5b4 
							
						 
					 
					
						
						
							
							Use generateNew directly and disable dep install  
						
						
						
						
					 
					
						2019-07-18 16:33:18 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							8c5ffc9a20 
							
						 
					 
					
						
						
							
							Fix naming  
						
						
						
						
					 
					
						2019-07-09 09:25:22 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							2060ce4ca1 
							
						 
					 
					
						
						
							
							Test manyWay relation  
						
						
						
						
					 
					
						2019-07-09 09:18:07 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							7dab357125 
							
						 
					 
					
						
						
							
							Cleanup and test Groups CRUD  
						
						
						
						
					 
					
						2019-07-02 13:28:18 +02:00 
						 
				 
			
				
					
						
							
							
								Fred Rivett 
							
						 
					 
					
						
						
						
						
							
						
						
							54fbe9cf0f 
							
						 
					 
					
						
						
							
							Fix wording of welcome text  
						
						... 
						
						
						
						The wording here is important as it's one of the first things the user
sees of the Strapi project having set it up, and it didn't quite make
sense (though everyone will understand what's meant to be said).
Tweaking this will improve the initial user experience of Strapi. 
						
						
					 
					
						2019-06-17 10:58:46 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							5e77287cc8 
							
						 
					 
					
						
						
							
							Rename strapi dev to strapi develop  
						
						
						
						
					 
					
						2019-05-15 16:00:06 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							1d27664ac4 
							
						 
					 
					
						
						
							
							Fix delete test as mongo returns the deleted object for now  
						
						
						
						
					 
					
						2019-05-13 14:00:12 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							3a2899470f 
							
						 
					 
					
						
						
							
							Implement more filtering tests  
						
						
						
						
					 
					
						2019-05-13 14:00:12 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							a2bfb52344 
							
						 
					 
					
						
						
							
							Refactor testing, add simple crud tests  
						
						
						
						
					 
					
						2019-05-13 14:00:12 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							9e60be6fb0 
							
						 
					 
					
						
						
							
							clean model creationg during tests  
						
						
						
						
					 
					
						2019-05-13 14:00:12 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							ba7b58558e 
							
						 
					 
					
						
						
							
							Clean workspace dependencies and add no-build option to strapi dev  
						
						
						
						
					 
					
						2019-05-03 17:19:01 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							bdd83eb689 
							
						 
					 
					
						
						
							
							Clean versions and test script  
						
						
						
						
					 
					
						2019-05-03 09:49:08 +02:00 
						 
				 
			
				
					
						
							
							
								soupette 
							
						 
					 
					
						
						
						
						
							
						
						
							f83458e5d1 
							
						 
					 
					
						
						
							
							Fix conflicts  
						
						
						
						
					 
					
						2019-04-24 10:58:21 +02:00 
						 
				 
			
				
					
						
							
							
								soupette 
							
						 
					 
					
						
						
						
						
							
						
						
							adf4e88ebb 
							
						 
					 
					
						
						
							
							Fix front unit tests  
						
						
						
						
					 
					
						2019-04-23 15:18:57 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							e78f8bbc8c 
							
						 
					 
					
						
						
							
							Cleanup code and make test/e2e.js run  
						
						
						
						
					 
					
						2019-04-23 11:24:29 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							50b371b853 
							
						 
					 
					
						
						
							
							Merge branch 'beta' into tech/core-api  
						
						
						
						
					 
					
						2019-04-19 08:26:13 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							0d72faaddc 
							
						 
					 
					
						
						
							
							Merge branch 'master' into beta  
						
						
						
						
					 
					
						2019-04-18 18:47:48 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							187700e1c9 
							
						 
					 
					
						
						
							
							Handle different databases names standards  
						
						
						
						
					 
					
						2019-04-18 16:01:31 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							f7d868caeb 
							
						 
					 
					
						
						
							
							Cleanup strapi new  
						
						
						
						
					 
					
						2019-04-17 17:13:17 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							59dc3eea36 
							
						 
					 
					
						
						
							
							Fix tests  
						
						
						
						
					 
					
						2019-04-16 18:05:12 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							87857b94be 
							
						 
					 
					
						
						
							
							Implement strapi.queries for all models  
						
						
						
						
					 
					
						2019-04-16 09:05:46 +02:00 
						 
				 
			
				
					
						
							
							
								cyril lopez 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8e80edc47c 
							
						 
					 
					
						
						
							
							Merge branch 'master' into front/admin-new-hook-architecture  
						
						
						
						
					 
					
						2019-04-12 18:43:59 +02:00 
						 
				 
			
				
					
						
							
							
								soupette 
							
						 
					 
					
						
						
						
						
							
						
						
							1544cdf877 
							
						 
					 
					
						
						
							
							Fix PR feedback  
						
						
						
						
					 
					
						2019-04-09 18:35:49 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							865664315f 
							
						 
					 
					
						
						
							
							Apply feedbacks  
						
						
						
						
					 
					
						2019-04-04 12:41:57 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							9bc56a3535 
							
						 
					 
					
						
						
							
							Apply review changes  
						
						
						
						
					 
					
						2019-03-29 16:53:25 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							e435201de4 
							
						 
					 
					
						
						
							
							Move basic type cast to the root buildQuery in strapi-utils  
						
						
						
						
					 
					
						2019-03-28 17:12:43 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							b93b4e105d 
							
						 
					 
					
						
						
							
							Cleanup tests  
						
						
						
						
					 
					
						2019-03-28 15:10:32 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							0c5b255e75 
							
						 
					 
					
						
						
							
							Fix graphql loaders and add some e2e graphql tests  
						
						
						
						
					 
					
						2019-03-25 16:37:46 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							6b417aa1fa 
							
						 
					 
					
						
						
							
							Setup travis jobs and stages  
						
						
						
						
					 
					
						2019-03-13 00:10:20 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							5c6618c525 
							
						 
					 
					
						
						
							
							Cleanup testing helpers and configuration  
						
						
						
						
					 
					
						2019-03-13 00:10:20 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							a0b45e2741 
							
						 
					 
					
						
						
							
							Add cypress run  
						
						
						
						
					 
					
						2019-03-13 00:10:20 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							96b023d16b 
							
						 
					 
					
						
						
							
							Restructure tests  
						
						
						
						
					 
					
						2019-03-13 00:10:19 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							f4b5a487d1 
							
						 
					 
					
						
						
							
							Add forceExit param to jest runner  
						
						
						
						
					 
					
						2019-03-13 00:10:19 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							865ee5e5e2 
							
						 
					 
					
						
						
							
							Init test automation  
						
						... 
						
						
						
						wip 
						
						
					 
					
						2019-03-13 00:10:19 +01:00 
						 
				 
			
				
					
						
							
							
								soupette 
							
						 
					 
					
						
						
						
						
							
						
						
							d81fba0488 
							
						 
					 
					
						
						
							
							Update tests with the single store  
						
						
						
						
					 
					
						2019-02-11 18:13:14 +01:00 
						 
				 
			
				
					
						
							
							
								Jim LAURIE 
							
						 
					 
					
						
						
						
						
							
						
						
							fdcecff2e6 
							
						 
					 
					
						
						
							
							Add test and fix model update  
						
						
						
						
					 
					
						2019-01-31 14:05:59 +01:00 
						 
				 
			
				
					
						
							
							
								soupette 
							
						 
					 
					
						
						
						
						
							
						
						
							66e45eb896 
							
						 
					 
					
						
						
							
							Change cypress test folder name  
						
						
						
						
					 
					
						2018-12-03 12:06:09 +01:00 
						 
				 
			
				
					
						
							
							
								soupette 
							
						 
					 
					
						
						
						
						
							
						
						
							685c39f0cf 
							
						 
					 
					
						
						
							
							Fix PR feedback  
						
						
						
						
					 
					
						2018-11-27 14:13:07 +01:00