7431 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jim LAURIE	3c567e8378	Merge branch 'master' into improve/ctb	2019-04-03 13:51:03 +02:00
Jim LAURIE	a8a59678fe	Merge pull request #2999 from abdonrd/patch-1 ... Added comment to improve linting of generated service files	2019-04-03 13:47:33 +02:00
Jim LAURIE	ba1c198c5f	Merge branch 'master' into patch-1	2019-04-03 13:47:25 +02:00
Jim LAURIE	61a4d68272	Merge pull request #3010 from strapi/fix/travis-build ... Run snyk only on non fork repo	2019-04-03 13:46:57 +02:00
soupette	ea54bbd1dd	Merge branch 'improve/ctb' of github.com:strapi/strapi into improve/ctb	2019-04-03 13:28:43 +02:00
soupette	b2b5535137	Remove useless file	2019-04-03 13:28:06 +02:00
Jim LAURIE	b4fc5746bb	Merge branch 'master' into fix/travis-build	2019-04-03 12:40:23 +02:00
Jim LAURIE	e2d2bd1cef	Merge branch 'master' into patch-1	2019-04-03 12:26:48 +02:00
Jim LAURIE	2c394225a0	Merge pull request #3077 from strapi/improve/ctb-feedback ... Fix CTB feedback	2019-04-03 11:23:10 +02:00
Jim LAURIE	0451b3f57a	Merge pull request #3079 from strapi/pause-pullrequests ... Add PR merge pause	2019-04-03 10:10:22 +02:00
Jim LAURIE	2fabe80c6f	Merge branch 'master' into pause-pullrequests	2019-04-03 10:10:11 +02:00
Jim LAURIE	f0eaa58d8d	Add PR merge pause	2019-04-02 20:02:09 +02:00
soupette	3494f49cfc	Fix Immutable and associated tests	2019-04-02 19:50:41 +02:00
soupette	f99850ea8d	Fix delete model	2019-04-02 18:45:47 +02:00
Jim LAURIE	798c6d1d5d	Merge pull request #3029 from strapi/fix/3000 ... Fix Blue button	2019-04-02 17:09:33 +02:00
Jim LAURIE	82e2079d54	Merge branch 'master' into fix/3000	2019-04-02 17:09:25 +02:00
soupette	67099a676a	Fix PR feedback	2019-03-29 16:33:05 +01:00
soupette	4b483ce6d8	Merge branch 'master' of github.com:strapi/strapi into improve/ctb	2019-03-29 15:56:53 +01:00
Jim LAURIE	1845353a02	Merge pull request #3038 from strapi/stm/remove-react-select ... Fix languages in settings manager	2019-03-29 14:33:44 +01:00
Jim LAURIE	656fa21450	Merge branch 'master' into stm/remove-react-select	2019-03-29 10:20:02 +01:00
Jim LAURIE	ae097ab2a2	Remove console.log	2019-03-29 10:19:30 +01:00
Jim LAURIE	4041e2de4a	Merge branch 'master' into fix/3000	2019-03-28 17:56:49 +01:00
Jim LAURIE	a2b537e90e	Merge pull request #3030 from strapi/fix/generators ... Fix front-end generators plugin	2019-03-28 16:48:49 +01:00
soupette	003b9a7ef8	Fixes #1325	2019-03-27 19:30:47 +01:00
soupette	c17538d2a4	Merge branch 'master' of github.com:strapi/strapi into improve/ctb	2019-03-27 18:53:35 +01:00
soupette	61e5e85730	Remove Cypress test because we will need to rewrite them for the repeatable fields	2019-03-27 18:50:24 +01:00
soupette	77115d93a1	Fix PR feedback	2019-03-27 18:37:53 +01:00
soupette	b98905a394	Test RelationForm	2019-03-27 18:24:51 +01:00
soupette	a3419da594	Fix order and update on relations	2019-03-27 15:20:45 +01:00
soupette	ebbe352d90	Fix front-end generators plugin	2019-03-26 21:29:10 +01:00
soupette	f327143ec7	Fixes #3000	2019-03-26 20:54:16 +01:00
soupette	0938c73e60	Fix attributes order	2019-03-26 18:50:07 +01:00
Jim LAURIE	114ac4a30d	Merge pull request #3027 from strapi/update/readme ... Update README to remove confusion on GitHub issues	2019-03-26 17:36:21 +01:00
DMehaffy	0f61590423	Update ReadMe to remove confusion on Github issues	2019-03-26 08:35:28 -07:00
soupette	d2f50f7bae	Fix relations	2019-03-25 19:08:17 +01:00
soupette	618d8afa4d	Fix edit attr	2019-03-25 13:02:00 +01:00
soupette	cde09a20e8	Allow to set values per line in the enum field	2019-03-25 12:36:04 +01:00
soupette	2b4396151c	Fix build	2019-03-25 12:15:44 +01:00
soupette	a861ee2fb5	Remove all useless files and add more tests to the app reducer	2019-03-23 13:50:20 +01:00
soupette	bd71c698bb	Finish relations	2019-03-23 12:11:56 +01:00
soupette	be9d94da53	Fix enumeration field	2019-03-23 09:18:11 +01:00
soupette	c1464f73be	Apply desgin feedback	2019-03-23 08:15:06 +01:00
soupette	8e672abc78	Remove useless components	2019-03-22 23:10:23 +01:00
soupette	ea560546ea	Add more tests	2019-03-22 23:03:37 +01:00
soupette	a0f5e57f10	Handle Relations	2019-03-22 20:34:51 +01:00
Alexandre BODIN	3282385ced	Merge branch 'master' into fix/travis-build	2019-03-22 19:01:29 +01:00
soupette	0a5341890e	Init Relation modal	2019-03-22 17:00:56 +01:00
soupette	63167318c1	Add tests to actions submit	2019-03-21 18:19:56 +01:00
soupette	5b3bd4c0f7	Merge branch 'master' of github.com:strapi/strapi into improve/ctb	2019-03-21 17:42:11 +01:00
soupette	0520a2ed14	Send request POST PUT DELETE	2019-03-21 17:41:26 +01:00