833 Commits

Author	SHA1	Message	Date
soupette	34b7737a64	Set Manager in helper plugin	2018-07-27 15:33:37 +02:00
soupette	d7b12f1871	Merge branch 'master' of github.com:strapi/strapi into settings-ctm-edit-view	2018-07-27 12:19:19 +02:00
Jim LAURIE	a0c49e3340	Fix package conflicts	2018-07-26 16:19:28 +02:00
Jim LAURIE	09a2a4b73d	3.0.0-alpha.13.0.1	2018-07-26 16:12:17 +02:00
soupette	5830ed4a73	Display empty block when no fields in the editPage	2018-07-26 13:10:26 +02:00
Jim LAURIE	927a900f5b	3.0.0-alpha.13	2018-07-25 17:31:16 +02:00
soupette	02acfefd01	Add sortfield logic in editPage	2018-07-23 17:46:05 +02:00
Leon Kyneur	92b045f647	Include yarn.lock in packages .gitignore	2018-07-22 09:26:48 +08:00
soupette	3890bc1211	Fix conflict	2018-07-13 12:33:52 +02:00
soupette	0b1a280c7a	Add PopUpWarning in edit page to warn before cancel changes	2018-07-13 12:19:07 +02:00
soupette	c2c9d95d1a	Fix PR feedback	2018-07-13 11:48:35 +02:00
Jim LAURIE	fa94d12e4f	3.0.0-alpha.12.7.1	2018-07-10 18:10:42 +02:00
Jim LAURIE	a6d48caad9	3.0.0-alpha.12.7	2018-07-10 15:37:47 +02:00
cyril lopez	d319d22f91	Fixes #1518	2018-07-06 14:15:59 +02:00
cyril lopez	56152f4462	Update schema in ctm bootstrap file to reflect the updated values	2018-07-05 17:09:34 +02:00
cyril lopez	c0c99d443a	Fix conflicts and add pt.json translation files in usr-perm plugin	2018-06-28 12:54:39 +02:00
cyril lopez	b396b29624	Fix ListView with new data	2018-06-28 12:12:54 +02:00
cyril lopez	799c6c3f0f	Remove webpack warnings and react-intl errors	2018-06-28 10:01:59 +02:00
cyril lopez	f09cace582	Remove JSON & Wysiwyg from helper-plugin and move them to content-manager	2018-06-28 09:46:10 +02:00
Jim LAURIE	534b17f77f	3.0.0-alpha.12.6	2018-06-26 18:23:36 +02:00
Aurelsicoko	0b1241300c	Update CSS & improve error management	2018-06-21 13:06:52 +02:00
cyril lopez	6f156144b5	Merge branch 'master' into add-loader	2018-06-20 15:15:34 +02:00
Jim LAURIE	c93fef17dc	Merge branch 'master' into input-json	2018-06-20 12:28:59 +02:00
Jim LAURIE	92bdb4e758	3.0.0-alpha.12.5	2018-06-18 16:49:28 +02:00
soupette	da865168e8	Fix css	2018-06-18 12:27:57 +02:00
soupette	372842ef5c	Merge branch 'master' of github.com:strapi/strapi into add-loader	2018-06-18 11:11:38 +02:00
soupette	bc0edd96d2	Fix error highlight	2018-06-18 11:02:14 +02:00
soupette	e4ed3b4d11	Merge master	2018-06-18 10:16:32 +02:00
soupette	7ffb90621a	Handle JSON errors	2018-06-15 16:48:29 +02:00
Jim Laurie	192c2ff1a9	Fix admin start fix #1371	2018-06-15 11:59:26 +02:00
soupette	cf6a2bdd25	merge	2018-06-14 16:49:39 +02:00
soupette	b749d8312b	Remove loadable import of wys	2018-06-14 16:21:25 +02:00
Jim LAURIE	1f45043aa1	Merge branch 'master' into fix-wysiwyg-autofocus-bug	2018-06-14 11:34:25 +02:00
soupette	f47aed1d3e	Add loaders to hp	2018-06-13 18:27:03 +02:00
soupette	b76574714c	Create specific loader for the WYSIWYG	2018-06-13 17:48:37 +02:00
Jim Laurie	69157dbba2	3.0.0-alpha.12.4	2018-06-13 17:39:37 +02:00
soupette	5cae072b19	Add loaders to ctm listpage	2018-06-13 16:17:19 +02:00
Johan Baath	5859af4027	don't update the state of the form if wysiwyg content has not changed	2018-06-13 14:57:07 +02:00
soupette	84871a0fd5	Add full page loader	2018-06-13 10:39:50 +02:00
soupette	1536896f62	Add loadable to plugins	2018-06-12 17:27:40 +02:00
soupette	4d7b7fa1e0	Fixes #1269	2018-06-07 19:33:25 +02:00
Jim Laurie	2a449532ec	3.0.0-alpha.12.3	2018-06-06 17:34:07 +02:00
Jim Laurie	cc9abff66d	Fix build assets	2018-06-06 14:18:23 +02:00
soupette	8302d32d71	Merge branch 'master' of github.com:strapi/strapi into content-manager-filters	2018-06-05 12:06:17 +02:00
Cyril lopez	cb895ab586	Fix PR feedback	2018-06-04 17:46:08 +02:00
Jim Laurie	c9b4e29c65	Merge branch 'test-suits' of github.com:strapi/strapi into test-suits	2018-06-04 14:43:09 +02:00
Jim Laurie	ec5ef9a240	Fix PR feedback	2018-06-04 14:39:26 +02:00
Jim LAURIE	3d3d75b135	Merge branch 'master' into test-suits	2018-06-03 20:59:57 +02:00
soupette	44cff94989	Fix conflicts	2018-05-31 15:31:46 +02:00
Johann Pinson	fc85f8b47e	Merge branch 'master' into patch-content-manager	2018-05-29 12:01:37 +02:00