445 Commits

Author	SHA1	Message	Date
Jim LAURIE	75fa810822	Merge branch 'master' into master	2018-05-08 17:15:23 +02:00
yann	0a759762ab	fix typo on fr translation 'ajouter un champs'	2018-05-08 17:08:54 +02:00
Jim LAURIE	0bb4f9cfae	Merge branch 'master' into npmignore	2018-05-08 11:36:35 +02:00
Jim Laurie	8f5443db17	3.0.0-alpha.12.1.3	2018-05-07 10:46:43 +02:00
Abdón Rodríguez Davila	0fbf3cae79	Ignore .editorconfig & .gitattributes in npm plugins & admin	2018-05-04 16:47:07 +02:00
Jim LAURIE	10eee03393	Merge branch 'master' into fix/886	2018-05-03 15:59:11 +02:00
Jim Laurie	c491c61a97	3.0.0-alpha.12.2	2018-05-03 14:15:21 +02:00
Jim Laurie	c944cb9e26	Fix loose many dominant	2018-05-02 17:41:09 +02:00
Aurelsicoko	a6fd8fc460	Fixes #886	2018-05-01 14:36:17 +02:00
Jim LAURIE	a3d9454ee0	Merge branch 'master' into fix-ctb	2018-05-01 11:29:31 +02:00
Zhuang	7634ff5602	add simplify chineses translation for plugins	2018-04-30 22:09:53 +08:00
soupette	67c6c1902f	Fixes #1065	2018-04-30 15:37:26 +02:00
soupette	ba6011beda	Fix popuprelation bug	2018-04-30 15:30:49 +02:00
Jim LAURIE	49ced583f3	Merge branch 'master' into fix/802	2018-04-27 16:40:57 +02:00
Aurelsicoko	af41ef444c	Fixes #802	2018-04-27 15:50:37 +02:00
Jim LAURIE	3416e46657	Merge branch 'master' into fix-860	2018-04-26 14:34:35 +02:00
Jim LAURIE	1850d5539b	Merge branch 'master' into improve-webpack-config	2018-04-26 14:20:10 +02:00
soupette	64984fded5	Fixes #860	2018-04-26 13:27:28 +02:00
soupette	b7fffb0ce7	Fixes #958	2018-04-25 16:34:20 +02:00
Jim LAURIE	4b508c8c39	Merge branch 'master' into improve/ctb	2018-04-24 18:10:50 +02:00
Aurelsicoko	1618d3f858	Reorder model root attribute and remove multiple key	2018-04-24 16:19:02 +02:00
Aurelsicoko	da1ead5e7b	Ignore file model in the CTB	2018-04-24 14:19:07 +02:00
Jim LAURIE	36393b9594	Merge branch 'master' into reduce-setup-monorepo	2018-04-23 12:32:01 +02:00
soupette	21e45890db	Fixes #964	2018-04-18 14:25:56 +02:00
Jim Laurie	ebd144fddb	3.0.0-alpha.12	2018-04-18 12:03:16 +02:00
soupette	fcc374c3fd	Fix conflicts	2018-04-17 11:50:52 +02:00
soupette	7b87af5e1b	Remove prebuild test and update documentation	2018-04-17 11:49:09 +02:00
Administrator	31a0393c52	Russian language pack for content type builder	2018-04-15 18:16:09 +03:00
Jim LAURIE	6e843dad3e	Merge branch 'master' into wysiwyg-preview-fullscreen	2018-04-12 15:02:13 +02:00
Jan Brachhold	d986055fb8	Update german translations	2018-04-11 21:19:31 +02:00
soupette	81109f558e	Fix conflict	2018-04-10 11:18:04 +02:00
Jim Laurie	ee12536e84	3.0.0-alpha.11.3	2018-04-05 14:13:50 +02:00
soupette	ff4253aeea	Fix conflict and fix focus bug in WYSIWYG	2018-04-04 17:51:41 +02:00
Jim LAURIE	45681235fa	Merge branch 'master' into wysiwyg-preview-fullscreen	2018-04-02 11:43:48 +02:00
Jim LAURIE	b9eea87885	Merge branch 'master' into ctb-default-value	2018-04-02 11:27:56 +02:00
Jim LAURIE	6e93e95d73	Merge branch 'master' into master	2018-03-31 15:11:59 +02:00
soupette	31b8e7cb34	Fixes #880	2018-03-30 20:27:37 +02:00
Inder Redni	1e914be7b7	polish language | update	2018-03-30 19:00:06 +02:00
soupette	1cb8de307a	Fix conflict	2018-03-30 18:05:42 +02:00
Jim Laurie	8390106f59	3.0.0-alpha.11.2	2018-03-27 17:59:16 +02:00
cyril lopez	00c7f0dffb	Remove	2018-03-26 15:32:27 +02:00
cyril lopez	f6c0061334	Allow default values for attributes	2018-03-26 15:25:32 +02:00
cyril lopez	8ca62198be	Add default values in ctb	2018-03-26 12:11:53 +02:00
cyril lopez	a4b517a193	Add info on wysiwyg in ctb	2018-03-23 15:47:00 +01:00
cyril lopez	fc995bb4a0	Fix ctb layout service	2018-03-22 13:36:36 +01:00
cyril lopez	7553172cf0	Fixes #828	2018-03-22 12:57:21 +01:00
cyril lopez	9354b7eeb1	Merge branch 'master' of github.com:strapi/strapi into wysiwyg	2018-03-20 16:13:27 +01:00
cyril lopez	c6b24f046b	Prevent the ctb from breaking if a user tries to edit an attribute that it cannot currently handle	2018-03-19 12:49:25 +01:00
cyril lopez	8207c2f45d	Merge branch 'wysiwyg' of github.com:strapi/strapi into wysiwyg	2018-03-15 11:32:22 +01:00
Jim Laurie	d77fb19592	Fix set attr name get model	2018-03-15 10:42:23 +01:00