6578 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
almera	974c748cf8	Change split for REGEX and return * when in array exist	2018-12-17 15:34:51 -05:00
almera	d31447ad93	Change split for REGEX and return * when in array exist	2018-12-17 15:13:38 -05:00
gianca970226	be585f6e17	Merge branch 'master' into master	2018-12-17 14:07:59 -05:00
Jim LAURIE	4060370868	Merge pull request #2442 from strapi/plugin-documentation ... Plugin documentation	2018-12-17 18:00:57 +01:00
Jim LAURIE	d394fb42ac	Fix lint	2018-12-17 17:42:36 +01:00
Jim LAURIE	6ebd33818e	Merge branch 'master' into master	2018-12-17 16:36:50 +01:00
Jim LAURIE	f87ebea759	Merge branch 'master' into plugin-documentation	2018-12-17 16:22:03 +01:00
Jim LAURIE	4466338701	Merge pull request #2493 from strapi/remove-snyk-travis ... Remove snyk from Travis	2018-12-15 11:41:37 +01:00
Jim LAURIE	3a6adadc4c	Remove snyk from Travis	2018-12-15 11:39:47 +01:00
Jim LAURIE	c4bc319e63	Merge branch 'master' into master	2018-12-14 17:18:34 +01:00
Jim LAURIE	12fc7ab8b7	Merge pull request #2486 from strapi/fix/travis ... Force snyk auth	2018-12-14 17:18:06 +01:00
Jim LAURIE	d761f98821	Merge branch 'master' into fix/travis	2018-12-14 17:17:30 +01:00
Jim LAURIE	2b909f1be3	Merge pull request #2487 from strapi/doc-migration-guide ... Add migration guide in documentation	2018-12-14 17:07:51 +01:00
Jim LAURIE	ec97504d3c	Add migration guide in documentation	2018-12-14 17:06:05 +01:00
soupette	d8f473ac2d	Force snyk auth	2018-12-14 15:52:35 +01:00
Jim LAURIE	09cdc88dbb	Merge pull request #2461 from JB1905/master ... Fix the display of longer attribute descriptions	2018-12-14 12:29:25 +01:00
Jim LAURIE	43e525e233	Merge branch 'master' into master	2018-12-14 12:29:16 +01:00
Jim LAURIE	8d15e22aeb	Merge pull request #2483 from strapi/doc-review ... Documentation review	2018-12-14 12:25:02 +01:00
Jim LAURIE	b4cffc4184	Fix PR feedback	2018-12-14 12:24:22 +01:00
Jim LAURIE	64fb27b7fd	Update documentation	2018-12-14 11:31:41 +01:00
soupette	b888be0b76	Fix JSON override	2018-12-13 18:04:24 +01:00
soupette	ab4571aa32	Fix model reference in route config	2018-12-13 16:29:57 +01:00
Jim LAURIE	8e18da0036	Change the default issue template	2018-12-13 15:44:44 +01:00
Jim LAURIE	0f8febfa35	Add JS example for file upload	2018-12-13 15:17:54 +01:00
almera	7c64b17343	Fix Identation retur	2018-12-13 07:40:25 -05:00
almera	497d428f0a	Fix Identation	2018-12-13 07:35:42 -05:00
Jim LAURIE	bcbbb70d10	Merge pull request #2348 from strapi/add-cypress ... Front-End tests with Cypress	2018-12-12 20:31:18 +01:00
Jim LAURIE	596d4dd791	Merge branch 'master' into add-cypress	2018-12-12 20:18:57 +01:00
Jim LAURIE	e819432b40	Merge pull request #2370 from jacargentina/fix-2257 ... Allow customization for mongoose connection (ej. load some mongoose plugins)	2018-12-12 16:45:55 +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
soupette	43966b8416	Fix conflicts	2018-12-12 14:25:44 +01:00
aDeve	e13d0d4174	fix content type builder cypress test: add contains	2018-12-12 13:56:21 +01:00
Jim LAURIE	816ed33ed2	Merge pull request #2435 from strapi/add-snyk ... Check dependencies vulnerability with Snyk	2018-12-12 12:05:10 +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
Jim LAURIE	83771ae154	Merge pull request #2469 from strapi/fix/2467 ... Fix to allow provider to be shown in the content manager	2018-12-11 17:43:53 +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	4d891974d2	Merge branch 'add-cypress' of github.com:strapi/strapi into add-cypress	2018-12-11 17:20:00 +01:00
almera	5350c623d1	Fix so you can choose multiple domains for the cors	2018-12-11 08:06:50 -05:00
soupette	27df580edb	Merge branch 'master' of github.com:strapi/strapi into add-cypress	2018-12-11 12:12:53 +01:00
Jim LAURIE	85b2fc3047	Lock the cypress version ... If we don't lock the version, there is a conflict between the installed version on the computer and the node nodule version.	2018-12-11 12:04:16 +01:00
Jim LAURIE	777a85264c	Merge pull request #2462 from derrickmehaffy/updatePluginDocs ... Plugin Documentation Part 2	2018-12-10 18:23:17 +01:00
DMehaffy	31d6c420a2	Few minor fixes and adding another note to the vuepress docs	2018-12-10 18:03:32 +01:00
Jakub Biesiada	690afc3c67	Merge branch 'master' into master	2018-12-10 17:17:41 +01:00
Jim LAURIE	568626c0a2	Merge pull request #2454 from strapi/plugin-install-log ... Review plugin install logs	2018-12-10 16:58:28 +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