Virginie Ky
							
						 
					 | 
					
						
						
						
						
							
						
						
							c47985cf9b
							
						
					 | 
					
						
						
							
							Merge branch 'features/dynamic-zones' into front/dynamic-zones-ctm-ui
						
						
						
						
						
						
					 | 
					
						2019-11-28 15:57:06 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Virginie Ky
							
						 
					 | 
					
						
						
						
						
							
						
						
							da82c145e8
							
						
					 | 
					
						
						
							
							Input File errors and ui
						
						
						
						
						
						
					 | 
					
						2019-11-27 10:28:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexandre Bodin
							
						 
					 | 
					
						
						
						
						
							
						
						
							9aff9af165
							
						
					 | 
					
						
						
							
							v3.0.0-beta.17.6
						
						
						
						
						
						
					 | 
					
						2019-11-25 18:54:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Virginie Ky
							
						 
					 | 
					
						
						
						
						
							
						
						
							c640f6872b
							
						
					 | 
					
						
						
							
							Icons grid adjustments
						
						
						
						
						
						
					 | 
					
						2019-11-25 15:56:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Virginie Ky
							
						 
					 | 
					
						
						
						
						
							
						
						
							11ccb5e7f3
							
						
					 | 
					
						
						
							
							Dynamic zone edit view ui
						
						
						
						
						
						
					 | 
					
						2019-11-20 17:46:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Virginie Ky
							
						 
					 | 
					
						
						
						
						
							
						
						
							a35702c86d
							
						
					 | 
					
						
						
							
							InputFile Ui and Errors
						
						
						
						
						
						
					 | 
					
						2019-11-20 17:46:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Virginie Ky
							
						 
					 | 
					
						
						
						
						
							
						
						
							79b2a257f9
							
						
					 | 
					
						
						
							
							Input files json texteditor width
						
						
						
						
						
						
					 | 
					
						2019-11-20 17:46:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								soupette
							
						 
					 | 
					
						
						
						
						
							
						
						
							dd488ed302
							
						
					 | 
					
						
						
							
							Created recursive to clean data and upload files
						
						
						
						
						
						
					 | 
					
						2019-11-20 16:46:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								soupette
							
						 
					 | 
					
						
						
						
						
							
						
						
							75378bfe06
							
						
					 | 
					
						
						
							
							Add AttributeIcon in popupform
						
						
						
						
						
						
					 | 
					
						2019-11-20 16:45:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								soupette
							
						 
					 | 
					
						
						
						
						
							
						
						
							444f671323
							
						
					 | 
					
						
						
							
							Created IconLayout move global trads into the admin and init DisplayedFields component
						
						
						
						
						
						
					 | 
					
						2019-11-20 16:45:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								soupette
							
						 
					 | 
					
						
						
						
						
							
						
						
							4f7f4a6c11
							
						
					 | 
					
						
						
							
							Fixes #2644
						
						
						
						
						
						
					 | 
					
						2019-11-06 17:51:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexandre Bodin
							
						 
					 | 
					
						
						
						
						
							
						
						
							b2e0ec5d1f
							
						
					 | 
					
						
						
							
							v3.0.0-beta.17.5
						
						
						
						
						
						
					 | 
					
						2019-11-04 17:52:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexandre Bodin
							
						 
					 | 
					
						
						
						
						
							
						
						
							7a61db7285
							
						
					 | 
					
						
						
							
							v3.0.0-beta.17.4
						
						
						
						
						
						
					 | 
					
						2019-10-23 15:11:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexandre Bodin
							
						 
					 | 
					
						
						
						
						
							
						
						
							9280cf9cd7
							
						
					 | 
					
						
						
							
							Merge branch 'master' into develop
						
						
						
						
						
						
					 | 
					
						2019-10-22 11:15:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexandre Bodin
							
						 
					 | 
					
						
						
						
						
							
						
						
							3ddd383c30
							
						
					 | 
					
						
						
							
							v3.0.0-beta.17.3
						
						
						
						
						
						
					 | 
					
						2019-10-22 11:05:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								soupette
							
						 
					 | 
					
						
						
						
						
							
						
						
							6a852ad6cb
							
						
					 | 
					
						
						
							
							Fix conflicts
						
						
						
						
						
						
					 | 
					
						2019-10-18 15:51:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Virginie Ky
							
						 
					 | 
					
						
						
						
						
							
						
						
							4d22b721ae
							
						
					 | 
					
						
						
							
							review done
						
						
						
						
						
						
					 | 
					
						2019-10-18 15:25:08 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexandre Bodin
							
						 
					 | 
					
						
						
						
						
							
						
						
							b6feabf689
							
						
					 | 
					
						
						
							
							v3.0.0-beta.17.2
						
						
						
						
						
						
					 | 
					
						2019-10-18 13:42:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Virginie Ky
							
						 
					 | 
					
						
						
						
						
							
						
						
							c4886d7936
							
						
					 | 
					
						
						
							
							review ip
						
						
						
						
						
						
					 | 
					
						2019-10-17 13:46:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								soupette
							
						 
					 | 
					
						
						
						
						
							
						
						
							75bd60162a
							
						
					 | 
					
						
						
							
							Fix some elements
						
						
						
						
						
						
					 | 
					
						2019-10-17 08:29:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexandre Bodin
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0ad2ab52c
							
						
					 | 
					
						
						
							
							Merge branch 'master' into develop
						
						
						
						
						
						
					 | 
					
						2019-10-16 14:16:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexandre Bodin
							
						 
					 | 
					
						
						
						
						
							
						
						
							9f0713649b
							
						
					 | 
					
						
						
							
							v3.0.0-beta.17.1
						
						
						
						
						
						
					 | 
					
						2019-10-16 11:42:54 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexandre Bodin
							
						 
					 | 
					
						
						
						
						
							
						
						
							7c8eda443e
							
						
					 | 
					
						
						
							
							v3.0.0-beta.17
						
						
						
						
						
						
					 | 
					
						2019-10-16 10:40:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d1e1c404e3
							
						
					 | 
					
						
						
							
							Merge branch 'develop' into update/plugin-generators
						
						
						
						
						
						
					 | 
					
						2019-10-15 07:42:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								soupette
							
						 
					 | 
					
						
						
						
						
							
						
						
							6ea77b69e5
							
						
					 | 
					
						
						
							
							Merge branch 'master' of github.com:strapi/strapi into develop
						
						
						
						
						
						
					 | 
					
						2019-10-15 07:40:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jelmer Visser
							
						 
					 | 
					
						
						
						
						
							
						
						
							16bd271eee
							
						
					 | 
					
						
						
							
							Fix for #3974 URIError appeared after entering % symbol into the Search input field (#4236)
						
						
						
						
						
						
					 | 
					
						2019-10-14 10:50:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								soupette
							
						 
					 | 
					
						
						
						
						
							
						
						
							20e7e9fcc3
							
						
					 | 
					
						
						
							
							Fix padding
						
						
						
						
						
						
					 | 
					
						2019-10-14 08:32:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Virginie Ky
							
						 
					 | 
					
						
						
						
						
							
						
						
							c53f3672b1
							
						
					 | 
					
						
						
							
							merge
						
						
						
						
						
						
					 | 
					
						2019-10-11 15:16:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Virginie Ky
							
						 
					 | 
					
						
						
						
						
							
						
						
							5b32e32758
							
						
					 | 
					
						
						
							
							Some UI fixes
						
						
						
						
						
						
					 | 
					
						2019-10-11 14:59:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Virginie Ky
							
						 
					 | 
					
						
						
						
						
							
						
						
							8040e89d7f
							
						
					 | 
					
						
						
							
							clean css and buttons ui
						
						
						
						
						
						
					 | 
					
						2019-10-10 16:21:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								soupette
							
						 
					 | 
					
						
						
						
						
							
						
						
							a27c8b2887
							
						
					 | 
					
						
						
							
							Merge branch 'develop' of github.com:strapi/strapi into front/remove-sass
						
						
						
						
						
						
					 | 
					
						2019-10-10 06:34:54 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								soupette
							
						 
					 | 
					
						
						
						
						
							
						
						
							beef6e5510
							
						
					 | 
					
						
						
							
							Fix conflicts
						
						
						
						
						
						
					 | 
					
						2019-10-10 06:34:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								soupette
							
						 
					 | 
					
						
						
						
						
							
						
						
							8bd092eff7
							
						
					 | 
					
						
						
							
							Remove all scss files in helper plugin
						
						
						
						
						
						
					 | 
					
						2019-10-09 18:06:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								soupette
							
						 
					 | 
					
						
						
						
						
							
						
						
							77c94645e8
							
						
					 | 
					
						
						
							
							Remove scss files
						
						
						
						
						
						
					 | 
					
						2019-10-09 15:44:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								soupette
							
						 
					 | 
					
						
						
						
						
							
						
						
							62acc713c1
							
						
					 | 
					
						
						
							
							Init styled-compo migration in helper plugin
						
						
						
						
						
						
					 | 
					
						2019-10-09 12:31:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Virginie Ky
							
						 
					 | 
					
						
						
						
						
							
						
						
							edc61d3522
							
						
					 | 
					
						
						
							
							Fix conflicts
						
						
						
						
						
						
					 | 
					
						2019-10-08 12:27:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Virginie Ky
							
						 
					 | 
					
						
						
						
						
							
						
						
							0c23fe8bae
							
						
					 | 
					
						
						
							
							Content manager UI
						
						
						
						
						
						
					 | 
					
						2019-10-08 11:51:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Virginie Ky
							
						 
					 | 
					
						
						
						
						
							
						
						
							6cae06b63c
							
						
					 | 
					
						
						
							
							Users permissions edit page responsive ip
						
						
						
						
						
						
					 | 
					
						2019-10-08 09:50:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Virginie Ky
							
						 
					 | 
					
						
						
						
						
							
						
						
							42257b3af4
							
						
					 | 
					
						
						
							
							Merge branch 'styled-component/ctb' of github.com:strapi/strapi into styled-component/ctb
						
						
						
						
						
						
					 | 
					
						2019-10-07 13:54:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Virginie Ky
							
						 
					 | 
					
						
						
						
						
							
						
						
							d4bc0c1683
							
						
					 | 
					
						
						
							
							Users permissions edit view policies fix
						
						
						
						
						
						
					 | 
					
						2019-10-07 13:42:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexandre BODIN
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							1a49d1a51e
							
						
					 | 
					
						
						
							
							Merge pull request #3691 from DKvistgaard/bugfix/cloudinary-delete-resource-type
						
						
						
						
						
						
						
						Fix Cloudinary deletion of other files than images 
						
						
					 | 
					
						2019-10-04 14:44:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexandre Bodin
							
						 
					 | 
					
						
						
						
						
							
						
						
							2d04d25097
							
						
					 | 
					
						
						
							
							v3.0.0-beta.16.8
						
						
						
						
						
						
					 | 
					
						2019-10-04 11:57:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							39988b3efb
							
						
					 | 
					
						
						
							
							Merge branch 'master' into develop
						
						
						
						
						
						
					 | 
					
						2019-10-03 10:47:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Kvistgaard
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							66cdd9d068
							
						
					 | 
					
						
						
							
							Merge branch 'master' into bugfix/cloudinary-delete-resource-type
						
						
						
						
						
						
					 | 
					
						2019-10-02 09:34:20 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Virginie Ky
							
						 
					 | 
					
						
						
						
						
							
						
						
							11f3871af1
							
						
					 | 
					
						
						
							
							Bootstrap and fonts without sass
						
						
						
						
						
						
					 | 
					
						2019-09-24 18:42:08 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexandre BODIN
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							b3648ba4d9
							
						
					 | 
					
						
						
							
							Merge branch 'master' into chore/routing-x-forwarded
						
						
						
						
						
						
					 | 
					
						2019-09-24 10:04:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril lopez
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							83a6fe44e4
							
						
					 | 
					
						
						
							
							Merge branch 'master' into front/context-api
						
						
						
						
						
						
					 | 
					
						2019-09-23 09:38:26 +02:00 | 
					
					
						
						
							
							
							
						
					 |