6517 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
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
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	4d891974d2	Merge branch 'add-cypress' of github.com:strapi/strapi into add-cypress	2018-12-11 17:20:00 +01: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
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
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	bba79c4448	Merge branch 'master' into add-cypress	2018-12-10 15:26:52 +01:00
Jim LAURIE	2b7c239715	Review plugin install logs	2018-12-09 12:46:46 +01:00
Jim LAURIE	507246227b	Merge pull request #2331 from Leo1003/fix/2282 ... Fix mongoose float and decimal problems	2018-12-09 12:20:15 +01:00
Jim LAURIE	134e89aa8e	Merge branch 'master' into fix/2282	2018-12-09 11:49:21 +01:00
Jim LAURIE	2edd056f66	Merge pull request #2354 from henrych4/fix-path-of-contentTypes ... Fix path of contentTypesToShow	2018-12-07 17:47:05 +01:00
Jim LAURIE	62e42fb6f6	Merge branch 'master' into fix-path-of-contentTypes	2018-12-07 17:24:08 +01:00
Jim LAURIE	093178462d	Merge pull request #2443 from patrikniebur/patch-2 ... ASC/DESC sort filters needs to be uppercase	2018-12-07 10:24:05 +01:00
patrikniebur	725f042403	ASC/DESC sort filters needs to be uppercase ... Otherwise I would get error 500 on latest strapi (`3.0.0-alpha.15`) which doesn't explain why	2018-12-07 10:59:31 +13: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	77fe603875	Force fetch master for travis	2018-12-06 11:40:29 +01:00
soupette	e7585b7372	Test travis	2018-12-06 11:09:23 +01:00
soupette	5eabf99403	Fix	2018-12-06 10:15:29 +01:00
soupette	928be5cf48	Force master fetch on travis	2018-12-06 10:12:15 +01:00
soupette	f146909361	Add snyk in travis	2018-12-05 18:33:23 +01:00
soupette	b9964df495	Remove lint from travis	2018-12-05 16:20:42 +01:00
soupette	636cb54c29	Add snyk	2018-12-05 15:42:58 +01:00
Jim LAURIE	585800b7b9	Merge pull request #2431 from strapi/3.0.0-alpha.16 ... 3.0.0-alpha.16	2018-12-04 18:34:25 +01:00
Jim LAURIE	a75e0c5485	3.0.0-alpha.16 v3.0.0-alpha.16	2018-12-04 18:31:19 +01:00
Jim LAURIE	47e7378c1e	Merge pull request #2430 from strapi/revert-filters ... Revert filter PR	2018-12-04 17:19:00 +01:00
Jim LAURIE	03c1e04d87	Revert filter PR	2018-12-04 17:05:03 +01:00
Jim LAURIE	7777e8c62c	Merge pull request #2427 from strapi/add-sponsors ... Add sponsors	2018-12-04 10:23:14 +01:00