4665 Commits

Author	SHA1	Message	Date
Jim LAURIE	43e525e233	Merge branch 'master' into master	2018-12-14 12:29:16 +01:00
Jim LAURIE	596d4dd791	Merge branch 'master' into add-cypress	2018-12-12 20:18:57 +01:00
Jim LAURIE	d201072954	Merge branch 'master' into fix-2257	2018-12-12 16:45:44 +01:00
Javier Castro	b0a21b46f0	strapi-hook-bookshelf: minor change for code clarity	2018-12-12 12:36:29 -03:00
Javier Castro	8b6bfdae70	Allow customization for mongoose connection (ej. load some mongoose plugins) ... configurations.md: Added section under Functions about optional bookshelf/mongoose customization	2018-12-12 12:36:19 -03:00
aDeve	e13d0d4174	fix content type builder cypress test: add contains	2018-12-12 13:56:21 +01:00
Jim LAURIE	29624bfa7e	Merge branch 'master' into add-snyk	2018-12-12 12:05:02 +01:00
soupette	a401739405	Fix lang issue	2018-12-12 11:55:17 +01:00
DMehaffy	fb845792ab	Fix to allow provider to be shown in the content manager	2018-12-11 17:40:57 +01:00
soupette	27df580edb	Merge branch 'master' of github.com:strapi/strapi into add-cypress	2018-12-11 12:12:53 +01:00
Jakub Biesiada	690afc3c67	Merge branch 'master' into master	2018-12-10 17:17:41 +01:00
Jim LAURIE	4d974abd81	Merge branch 'master' into plugin-install-log	2018-12-10 16:57:10 +01:00
Jim LAURIE	ecfe9d820b	Merge pull request #2440 from strapi/revert-fa ... Revert FA language	2018-12-10 16:55:41 +01:00
Jim LAURIE	f8c0a7daad	Merge pull request #2414 from strapi/clean-generated-files ... Remove .npmignore from generated files.	2018-12-10 16:52:49 +01:00
Jakub Biesiada	a7a024b9d0	Update styles.scss	2018-12-10 16:46:21 +01:00
Jim LAURIE	2b7c239715	Review plugin install logs	2018-12-09 12:46:46 +01:00
Jim LAURIE	134e89aa8e	Merge branch 'master' into fix/2282	2018-12-09 11:49:21 +01:00
Jim LAURIE	62e42fb6f6	Merge branch 'master' into fix-path-of-contentTypes	2018-12-07 17:24:08 +01:00
Jim LAURIE	a90e206579	Revert FA language	2018-12-06 12:20:32 +01:00
soupette	de1d66dec4	Catch error	2018-12-06 12:13:27 +01:00
soupette	e7585b7372	Test travis	2018-12-06 11:09:23 +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	44e3154cef	Remove .npmignore from generated files close #823	2018-12-01 16:44:56 +01:00
Jim LAURIE	f2e5f1e2df	Merge branch 'master' into graphqlCustomLimit	2018-11-30 16:31:55 +01:00
Kirill	3ba07e3c74	translation fix	2018-11-29 22:15:48 +03:00
Jim LAURIE	85b6dcb0e2	Merge branch 'master' into master	2018-11-29 12:11:19 +01:00
DMehaffy	2b38a92277	Add GraphQL limit settings	2018-11-29 03:46:30 -07: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	a35ba3c6ca	Merge branch 'master' into eslint/fix-indent-cond-expr	2018-11-28 19:31:34 +01:00
Jim LAURIE	3860b5c3f0	Merge branch 'master' into patch-1	2018-11-28 19:24:44 +01:00
cyril lopez	c3cc74d6e7	Update index.js	2018-11-28 17:11:05 +01:00
soupette	d74cbece73	Fix eslint and prettier	2018-11-28 16:11:10 +01:00
soupette	3053ab517b	Fix eslint indent ternary expression	2018-11-28 15:56:56 +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
Dorell James Galang	d3a21463c8	Fix upload for videos and other format	2018-11-28 13:54:04 +08:00
soupette	d60b5c5b34	Fix conflicts	2018-11-27 20:22:41 +01:00
Jim LAURIE	2afb30b2f9	Deprecated providers	2018-11-27 17:30:35 +01:00
Jim LAURIE	a39ec8c3ed	Merge branch 'master' into fix-fetch-user	2018-11-27 16:53:00 +01:00
Jim LAURIE	00d6284552	Fix fetch user mongoose	2018-11-27 16:44:20 +01:00
Jim LAURIE	48a07fde4d	Merge branch 'master' into fix-missing-contentType-in-content-manager	2018-11-27 15:44:28 +01:00
Jim LAURIE	6558b38814	Fix delete all	2018-11-27 14:45:01 +01:00
soupette	685c39f0cf	Fix PR feedback	2018-11-27 14:13:07 +01:00
henrych4	84921e3f76	display a content type based on layout schema	2018-11-27 20:57:03 +08:00