1421 Commits

Author	SHA1	Message	Date
Jim LAURIE	2b3af8300c	Add migration of jwt.json file	2019-01-06 14:00:04 +01:00
Aurélien Georget	b501e8bb1b	Resolve conflicts	2019-01-05 20:33:47 +01:00
Paolo Ragone	2a1cb510b9	Merge branch 'master' into patch-1	2019-01-05 09:40:58 +13:00
Abdón Rodríguez Davila	3f73964f59	Merge branch 'master' into fix-gae-deploy	2019-01-04 13:17:43 +01:00
Jim LAURIE	09530e9cd9	3.0.0-alpha.18	2019-01-04 11:23:15 +01:00
soupette	2ab9be48ee	Fixes #2555	2019-01-03 17:24:06 +01:00
Paolo Ragone	947dd2b502	Added missing semicolon	2018-12-26 12:11:12 +13:00
Paolo Ragone	382722b74c	Fix provider query building bug ... Fixes #2536 Does so by fixing the parameters to the query call	2018-12-26 11:10:35 +13:00
Abdón Rodríguez Davila	df162c1387	Avoid write actions.json if not development environment	2018-12-19 19:42:10 +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
soupette	b888be0b76	Fix JSON override	2018-12-13 18:04:24 +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
Jim LAURIE	29624bfa7e	Merge branch 'master' into add-snyk	2018-12-12 12:05:02 +01:00
DMehaffy	fb845792ab	Fix to allow provider to be shown in the content manager	2018-12-11 17:40:57 +01:00
soupette	1e49666aab	Remove useless generated files	2018-12-11 17:31:40 +01:00
soupette	27df580edb	Merge branch 'master' of github.com:strapi/strapi into add-cypress	2018-12-11 12:12:53 +01:00
DMehaffy	31d6c420a2	Few minor fixes and adding another note to the vuepress docs	2018-12-10 18:03:32 +01:00
soupette	52e5f87cd3	Fix post schema	2018-12-07 00:14:59 +01:00
Aurélien Georget	e1ce257d2f	Revert codebase and apply limit, skip, start and sort parameters	2018-12-06 18:11:53 +01:00
soupette	7ed610242a	Add token in swagger and fix private fields	2018-12-06 18:03:56 +01:00
soupette	0916c4e018	Fix conflicts	2018-12-06 16:39:20 +01:00
soupette	f146909361	Add snyk in travis	2018-12-05 18:33:23 +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
Jim LAURIE	03c1e04d87	Revert filter PR	2018-12-04 17:05:03 +01:00
soupette	66e45eb896	Change cypress test folder name	2018-12-03 12:06:09 +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	f2ec28907e	Merge branch 'master' into master	2018-11-29 11:45:42 +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
Aurélien Georget	b0aaae9f12	Resolve conflicts	2018-11-27 18:48:37 +01:00
Jim LAURIE	00d6284552	Fix fetch user mongoose	2018-11-27 16:44:20 +01:00
Aurélien Georget	540e1bccf8	Allow private attribute into input definition	2018-11-27 14:59:28 +01:00
Aurélien Georget	9e0faf9b5c	Fix deleteUser mutation for Mongoose and Bookshelf	2018-11-27 14:54:34 +01:00
soupette	685c39f0cf	Fix PR feedback	2018-11-27 14:13:07 +01:00
Aurélien Georget	143f92a338	Follow generated GraphQL input to return data	2018-11-26 18:32:35 +01:00
soupette	4ddceb3123	Merge branch 'master' of github.com:strapi/strapi into add-cypress	2018-11-26 16:15:38 +01:00
soupette	80adfdfde8	Merge branch 'master' of github.com:strapi/strapi into add-cypress	2018-11-22 19:45:31 +01:00
soupette	d98db6415b	Add cypress in monorepo and split by package	2018-11-22 19:19:04 +01:00
Jim LAURIE	693ea6ed93	Merge branch 'master' into fix/reattempt-1851	2018-11-22 18:18:20 +01:00
Jim LAURIE	7e00be7057	Merge branch 'master' into master	2018-11-22 12:57:16 +01:00
Jim LAURIE	63cfa2e60b	Merge branch 'master' into feature/allow-filtering-on-a-relation-attribute	2018-11-22 12:17:43 +01:00
Aurelsicoko	402d1fb4b6	Map result to retrieve data from loaders	2018-11-21 19:37:19 +01:00
Jim LAURIE	460c092897	Merge branch 'master' into patch-1	2018-11-21 17:39:42 +01:00
Jim LAURIE	ef0f40701f	Merge branch 'master' into fix/css-container-fluid	2018-11-21 11:56:19 +01:00
Kamal Bennani Bouchiba	6482a6ec84	Merge branch 'master' into feature/allow-filtering-on-a-relation-attribute	2018-11-20 19:34:46 +01:00