Virginie Ky 
							
						 
					 
					
						
						
						
						
							
						
						
							953f5b8ba3 
							
						 
					 
					
						
						
							
							upload plugin UI  
						
						
						
						
					 
					
						2019-10-08 10:53:01 +02:00 
						 
				 
			
				
					
						
							
							
								cyril lopez 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							39988b3efb 
							
						 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						
						
						
					 
					
						2019-10-03 10:47:25 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							dbd621e6d8 
							
						 
					 
					
						
						
							
							v3.0.0-beta.16.7  
						
						
						
						
					 
					
						2019-10-01 12:15:48 +02:00 
						 
				 
			
				
					
						
							
							
								cyril lopez 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3a4bb7fda5 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into front/context-api  
						
						
						
						
					 
					
						2019-09-27 15:44:15 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							6305bee43b 
							
						 
					 
					
						
						
							
							v3.0.0-beta.16.6  
						
						
						
						
					 
					
						2019-09-26 14:35:06 +02:00 
						 
				 
			
				
					
						
							
							
								cyril lopez 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							83a6fe44e4 
							
						 
					 
					
						
						
							
							Merge branch 'master' into front/context-api  
						
						
						
						
					 
					
						2019-09-23 09:38:26 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							bf7870de3b 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:strapi/strapi into chore/routing-x-forwarded  
						
						
						
						
					 
					
						2019-09-18 17:29:09 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							84adbf3bcf 
							
						 
					 
					
						
						
							
							v3.0.0-beta.16.5  
						
						
						
						
					 
					
						2019-09-18 14:00:21 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre BODIN 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7a94d9dad9 
							
						 
					 
					
						
						
							
							Merge branch 'master' into chore/routing-x-forwarded  
						
						
						
						
					 
					
						2019-09-18 13:27:39 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							9eaabb1d58 
							
						 
					 
					
						
						
							
							Add tests on graphql upload and user perm graphql  
						
						
						
						
					 
					
						2019-09-18 12:07:59 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							6c2d413ba0 
							
						 
					 
					
						
						
							
							Fix user-permissions graphql permissions and update user  
						
						
						
						
					 
					
						2019-09-18 12:07:45 +02:00 
						 
				 
			
				
					
						
							
							
								soupette 
							
						 
					 
					
						
						
						
						
							
						
						
							6e425923ba 
							
						 
					 
					
						
						
							
							Fix PR feedback  
						
						
						
						
					 
					
						2019-09-17 16:04:38 +02:00 
						 
				 
			
				
					
						
							
							
								cyril lopez 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6c8a446e0c 
							
						 
					 
					
						
						
							
							Merge branch 'master' into front/context-api  
						
						
						
						
					 
					
						2019-09-17 13:36:59 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							df236d0642 
							
						 
					 
					
						
						
							
							v3.0.0-beta.16.4  
						
						
						
						
					 
					
						2019-09-17 12:14:39 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre BODIN 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2e95a31627 
							
						 
					 
					
						
						
							
							Merge branch 'master' into fix/graphql-issues  
						
						
						
						
					 
					
						2019-09-17 10:37:04 +02:00 
						 
				 
			
				
					
						
							
							
								cyril lopez 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8657453ea2 
							
						 
					 
					
						
						
							
							Merge branch 'master' into eslint-update  
						
						
						
						
					 
					
						2019-09-17 10:11:11 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							0026819119 
							
						 
					 
					
						
						
							
							Fix files resolver graphql  
						
						
						
						
					 
					
						2019-09-16 23:19:10 +02:00 
						 
				 
			
				
					
						
							
							
								soupette 
							
						 
					 
					
						
						
						
						
							
						
						
							6494a3dd07 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:strapi/strapi into front/context-api  
						
						
						
						
					 
					
						2019-09-16 13:52:59 +02:00 
						 
				 
			
				
					
						
							
							
								soupette 
							
						 
					 
					
						
						
						
						
							
						
						
							62862f07c5 
							
						 
					 
					
						
						
							
							Update context api  
						
						
						
						
					 
					
						2019-09-16 12:23:52 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre BODIN 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c66eb5d2cf 
							
						 
					 
					
						
						
							
							Merge branch 'master' into chore/routing-x-forwarded  
						
						
						
						
					 
					
						2019-09-13 17:40:50 +02:00 
						 
				 
			
				
					
						
							
							
								soupette 
							
						 
					 
					
						
						
						
						
							
						
						
							c971ab5ada 
							
						 
					 
					
						
						
							
							Remove all context api in all plugins except users  
						
						
						
						
					 
					
						2019-09-13 17:05:21 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							36e4e73ad3 
							
						 
					 
					
						
						
							
							v3.0.0-beta.16.3  
						
						
						
						
					 
					
						2019-09-13 15:08:44 +02:00 
						 
				 
			
				
					
						
							
							
								cyril lopez 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							087226b5e4 
							
						 
					 
					
						
						
							
							Merge branch 'master' into styled-components/email  
						
						
						
						
					 
					
						2019-09-12 17:41:05 +02:00 
						 
				 
			
				
					
						
							
							
								Abdón Rodríguez Davila 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							54c383fd44 
							
						 
					 
					
						
						
							
							Merge branch 'master' into eslint-update  
						
						
						
						
					 
					
						2019-09-12 15:05:53 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							e20d781383 
							
						 
					 
					
						
						
							
							Merge branch 'master' into chore/routing-x-forwarded  
						
						
						
						
					 
					
						2019-09-12 09:59:11 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							7207184648 
							
						 
					 
					
						
						
							
							v3.0.0-beta.16.2  
						
						
						
						
					 
					
						2019-09-11 19:22:05 +02:00 
						 
				 
			
				
					
						
							
							
								soupette 
							
						 
					 
					
						
						
						
						
							
						
						
							2077e3d782 
							
						 
					 
					
						
						
							
							Fix PR feedback  
						
						
						
						
					 
					
						2019-09-11 18:56:37 +02:00 
						 
				 
			
				
					
						
							
							
								soupette 
							
						 
					 
					
						
						
						
						
							
						
						
							91d33163d2 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:strapi/strapi into styled-components/upload  
						
						
						
						
					 
					
						2019-09-11 11:17:24 +02:00 
						 
				 
			
				
					
						
							
							
								soupette 
							
						 
					 
					
						
						
						
						
							
						
						
							ce2575151e 
							
						 
					 
					
						
						
							
							Migrate plugin to styled compo  
						
						
						
						
					 
					
						2019-09-11 11:00:40 +02:00 
						 
				 
			
				
					
						
							
							
								soupette 
							
						 
					 
					
						
						
						
						
							
						
						
							ff184ec200 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:strapi/strapi into styled-components/upload  
						
						
						
						
					 
					
						2019-09-11 10:19:22 +02:00 
						 
				 
			
				
					
						
							
							
								soupette 
							
						 
					 
					
						
						
						
						
							
						
						
							0289a7a3d3 
							
						 
					 
					
						
						
							
							Start removing sass in upload components  
						
						
						
						
					 
					
						2019-09-10 16:34:43 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							7d51b8625d 
							
						 
					 
					
						
						
							
							v3.0.0-beta.16.1  
						
						
						
						
					 
					
						2019-09-10 16:33:22 +02:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							2530606e47 
							
						 
					 
					
						
						
							
							Merge branch 'master' into chore/routing-x-forwarded  
						
						
						
						
					 
					
						2019-09-09 14:29:07 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							05597970fa 
							
						 
					 
					
						
						
							
							v3.0.0-beta.16  
						
						
						
						
					 
					
						2019-09-09 13:35:57 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							a22f2cefef 
							
						 
					 
					
						
						
							
							Remove x-forwarded-host.  
						
						... 
						
						
						
						- set security defaults for development mode that are standard
- refactor error messages to work without ctx.request.admin
- remove mask middleware and add a sanitization layer to the core-api to
hide private fileds 
						
						
					 
					
						2019-09-06 14:33:24 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							7c5f1484ba 
							
						 
					 
					
						
						
							
							Use koa-router and fix graphql-uploads  
						
						
						
						
					 
					
						2019-08-22 15:04:27 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							2a780ea10a 
							
						 
					 
					
						
						
							
							Clear _id now that queries return an id everytime  
						
						
						
						
					 
					
						2019-08-13 17:40:31 +02:00 
						 
				 
			
				
					
						
							
							
								soupette 
							
						 
					 
					
						
						
						
						
							
						
						
							857ec1ca70 
							
						 
					 
					
						
						
							
							Rename lifecycle hooks  
						
						
						
						
					 
					
						2019-08-13 11:31:10 +02:00 
						 
				 
			
				
					
						
							
							
								soupette 
							
						 
					 
					
						
						
						
						
							
						
						
							d52d4f603f 
							
						 
					 
					
						
						
							
							Upgrade react deps  
						
						
						
						
					 
					
						2019-08-13 11:22:36 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							3b47457f4f 
							
						 
					 
					
						
						
							
							make boostrap functions async only  
						
						
						
						
					 
					
						2019-08-12 15:35:40 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							ebf3922905 
							
						 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						
						
						
					 
					
						2019-08-12 09:39:59 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							fe2c2dccb3 
							
						 
					 
					
						
						
							
							v3.0.0-beta.15  
						
						
						
						
					 
					
						2019-08-12 09:35:27 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							8f24eff499 
							
						 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						
						
						
					 
					
						2019-08-08 14:30:25 +02:00 
						 
				 
			
				
					
						
							
							
								soupette 
							
						 
					 
					
						
						
						
						
							
						
						
							62c367f024 
							
						 
					 
					
						
						
							
							Fixes   #3738  
						
						
						
						
					 
					
						2019-08-08 12:47:32 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							bb036333a2 
							
						 
					 
					
						
						
							
							Init upload plugin e2e tests  
						
						
						
						
					 
					
						2019-08-06 10:46:53 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre BODIN 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3060703b25 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into chore/support-file-upload-cm-core-api  
						
						
						
						
					 
					
						2019-08-01 17:31:09 +02:00 
						 
				 
			
				
					
						
							
							
								virginieky 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							49aa6954f2 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into ctm/repeatable-edit-view  
						
						
						
						
					 
					
						2019-08-01 16:52:23 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Bodin 
							
						 
					 
					
						
						
						
						
							
						
						
							f99e2ab683 
							
						 
					 
					
						
						
							
							Support upload multipart in content manager creation and edition of data  
						
						
						
						
					 
					
						2019-08-01 12:20:28 +02:00