1117 Commits

Author	SHA1	Message	Date
harimkims	5f62dbc9a5	Update KO translation	2019-12-04 17:08:08 +09:00
Alexandre Bodin	cf6ecbff4f	v3.0.0-beta.17.8	2019-12-01 23:20:50 +01:00
Jim LAURIE	8199f2d59c	v3.0.0-beta.17.7	2019-11-29 17:36:51 +01:00
Alexandre Bodin	9aff9af165	v3.0.0-beta.17.6	2019-11-25 18:54:50 +01:00
Jim LAURIE	baaa679aaf	Merge branch 'master' into add_en_translations_for_uuid_and_icon	2019-11-06 14:19:00 +01:00
Alexandre Bodin	b2e0ec5d1f	v3.0.0-beta.17.5	2019-11-04 17:52:02 +01:00
Max Helmetag	5260780482	use uuid icon instead of placeholder	2019-11-01 10:58:13 -07:00
Max Helmetag	1abebcf2b5	add uuid icon reference to icon util	2019-10-31 00:33:05 -07:00
Max Helmetag	7f265db900	add uuid translations for content builder and placeholder icon	2019-10-30 01:40:27 -07: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	931551813d	Merge branch 'master' of github.com:strapi/strapi into develop	2019-10-22 10:18:59 +02:00
Stephen Latham	067f8ece03	Fix for issue #4138 - Cannot remove default value for number type in group	2019-10-21 11:17:20 +01:00
soupette	6a852ad6cb	Fix conflicts	2019-10-18 15:51:44 +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
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
Alexandre Bodin	866a612d41	Merge branch 'master' into develop	2019-10-15 17:48:45 +02:00
DMehaffy	32c161f287	Change enum regex message for special characters (#4255)	2019-10-15 17:20:50 +02:00
soupette	f0b230f0af	Merge branch 'develop' of github.com:strapi/strapi into front/fix-ctb-issues	2019-10-10 21:25:24 +02:00
soupette	afda62d1ba	Update snapshots	2019-10-10 16:40:53 +02:00
soupette	3e7ee49154	Fixes #2149 #3016 #3471	2019-10-10 08:49:33 +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	e84beef88f	fix tests	2019-10-09 18:12:42 +02:00
soupette	05a1e69888	Remove sass ctb	2019-10-09 12:00:52 +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	b60ae59170	Content type builder Models List UI	2019-10-08 11:09:49 +02:00
Samuel Durkin	82f6c3ca98	fix images not respecting configurable being set as false	2019-10-05 18:17:32 +02:00
Alexandre Bodin	2d04d25097	v3.0.0-beta.16.8	2019-10-04 11:57:46 +02:00
soupette	5c42e43d4f	Merge branch 'develop' of github.com:strapi/strapi into styled-component/ctb	2019-10-03 11:09:48 +02:00
cyril lopez	39988b3efb	Merge branch 'master' into develop	2019-10-03 10:47:25 +02:00
Alexandre BODIN	0590ba2dcc	Merge branch 'master' into fix/self-referencing-many-way	2019-10-01 12:49:18 +02:00
soupette	cf8bcf627b	Fix manyWay with self ct	2019-10-01 12:42:42 +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
cyril lopez	83a6fe44e4	Merge branch 'master' into front/context-api	2019-09-23 09:38:26 +02:00
Virginie Ky	230ba6b41f	merge master	2019-09-19 17:09:29 +02:00
Alexandre Bodin	84adbf3bcf	v3.0.0-beta.16.5	2019-09-18 14:00:21 +02:00
Virginie Ky	88a11cef3c	node-sass removed	2019-09-17 16:20: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
cyril lopez	8657453ea2	Merge branch 'master' into eslint-update	2019-09-17 10:11:11 +02:00