854 Commits

Author	SHA1	Message	Date
Aurélien Georget	8170d061c3	Fix conflicts	2019-02-12 17:01:36 +01:00
Jim LAURIE	83f0bb012a	Merge branch 'master' into fix/ctm-edit-view-main-field	2019-02-11 15:28:13 +01:00
Jim LAURIE	42b4a56c0a	3.0.0-alpha.23.1	2019-02-07 13:08:41 +01:00
Jim LAURIE	ff84a82466	3.0.0-alpha.23	2019-02-07 10:40:33 +01:00
soupette	b11e099cd8	Merge branch 'master' of github.com:strapi/strapi into fix/front-generators	2019-02-06 12:09:00 +01:00
Jim LAURIE	7555cc5952	3.0.0-alpha.22	2019-02-04 18:21:48 +01:00
soupette	da424a4ca7	Fix displayed field on remove	2019-02-04 17:03:51 +01:00
Aurélien Georget	6c5dcd2c83	Fix setup on Mac	2019-02-01 17:04:08 +01:00
Aurélien Georget	bfa77385a1	Remove logs	2019-01-31 19:27:54 +01:00
Aurelsicoko	3928ac56a3	Merge branch 'enhancement-install-cmd' of https://github.com/strapi/strapi into enhancement-install-cmd	2019-01-31 18:45:50 +01:00
Aurelsicoko	78e9c5ed8a	Fix start and admin setup on Windows	2019-01-31 18:42:54 +01:00
Jim LAURIE	59a7e04a75	Update npmcheckversion.js	2019-01-31 14:38:48 +01:00
Jim LAURIE	2199fa3943	Merge branch 'master' into fix/#1960	2019-01-30 17:39:35 +01:00
soupette	3ef28669d3	Update strapi-generate-plugin	2019-01-30 17:10:54 +01:00
soupette	807ca3bce8	Fix front generators	2019-01-30 17:08:41 +01:00
soupette	eb7daf9a73	Created new container for marketplace	2019-01-30 12:01:17 +01:00
Jim LAURIE	72183f299b	Use shelljs for every exec command	2019-01-28 16:23:47 +01:00
Aurélien Georget	48fabe4567	Redesign marketplace and add new blocker component	2019-01-24 18:24:24 +01:00
Jim LAURIE	ee8c94f09f	3.0.0-alpha.21	2019-01-23 16:27:46 +01:00
Jim LAURIE	25f21fae42	3.0.0-alpha.20	2019-01-22 14:31:49 +01:00
soupette	4a160b04fd	Fixes #1960	2019-01-20 14:21:38 +01:00
Jim LAURIE	c3c24ca7ad	3.0.0-alpha.19	2019-01-16 11:49:16 +01:00
Jim LAURIE	09530e9cd9	3.0.0-alpha.18	2019-01-04 11:23:15 +01:00
Jim LAURIE	fd3ae96498	3.0.0-alpha.17	2018-12-18 14:37:15 +01:00
Jim LAURIE	f87ebea759	Merge branch 'master' into plugin-documentation	2018-12-17 16:22:03 +01:00
Jim LAURIE	596d4dd791	Merge branch 'master' into add-cypress	2018-12-12 20:18:57 +01:00
soupette	43966b8416	Fix conflicts	2018-12-12 14:25:44 +01:00
soupette	a401739405	Fix lang issue	2018-12-12 11:55:17 +01:00
soupette	27df580edb	Merge branch 'master' of github.com:strapi/strapi into add-cypress	2018-12-11 12:12:53 +01:00
soupette	9882078843	Move react-copy-toclipboard in helper	2018-12-06 19:02:12 +01:00
soupette	54fdbc6897	Add option to copy token in the ui	2018-12-06 19:00:49 +01:00
soupette	636cb54c29	Add snyk	2018-12-05 15:42:58 +01:00
Jim LAURIE	a75e0c5485	3.0.0-alpha.16	2018-12-04 18:31:19 +01:00
soupette	43e02ffb3d	Merge branch 'master' of github.com:strapi/strapi into add-cypress	2018-12-03 11:24:03 +01:00
Jim LAURIE	c126b94325	Merge branch 'master' into fixNodeVersions	2018-11-29 11:21:55 +01:00
Jim LAURIE	fb03d4f18c	3.0.0-alpha.15	2018-11-28 14:55:41 +01:00
DMehaffy	ecb6baaea5	Update all the packages and generated json	2018-11-28 00:14:12 -07:00
soupette	d60b5c5b34	Fix conflicts	2018-11-27 20:22:41 +01:00
soupette	0aa7796a82	Merge branch 'master' of github.com:strapi/strapi into add-cypress	2018-11-27 12:27:18 +01:00
soupette	547563f56f	Lock babel dependencies version until I found the dependency to update	2018-11-26 18:18:49 +01:00
soupette	a225d144c6	Add selector for errors	2018-11-21 12:57:20 +01:00
soupette	5406b678ac	Add selectors for tests and fix bugs	2018-11-16 09:18:57 +01:00
soupette	d9ee893c8f	Merge branch 'master' of github.com:strapi/strapi into add-cypress	2018-11-14 18:20:40 +01:00
soupette	779f575b47	Access reducer from cypress	2018-11-13 16:53:50 +01:00
Jim LAURIE	8fcf2ed8ae	3.0.0-alpha.14.5	2018-11-13 14:50:07 +01:00
soupette	2a5f0c95d2	Fix conflict	2018-11-08 17:54:45 +01:00
soupette	7a66850aa6	Add ids to buttons in ctb	2018-11-08 16:32:34 +01:00
Alberto Maturano	980b6d240d	Improve code style and code quality ... Just some little improvements that I found looking around the code. Related 2410d5a	2018-10-30 16:55:11 -06:00
Jim LAURIE	01a2442e7d	3.0.0-alpha.14.4.0	2018-10-25 17:18:26 +02:00
Jim LAURIE	379331f822	3.0.0-alpha.14.4	2018-10-25 16:41:07 +02:00