29765 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
soupette	54f54a4aa9	Fix doc	2018-12-10 10:02:59 +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
soupette	3c6e28c39b	Update plugin description	2018-12-07 17:38:26 +01:00
Jim LAURIE	62e42fb6f6	Merge branch 'master' into fix-path-of-contentTypes	2018-12-07 17:24:08 +01:00
soupette	59436ec2e9	Add documentation	2018-12-07 17:05:25 +01:00
Javier Castro	ab5b80e934	Fix #2444: avoid duplicating the message when wrapping errors with Bom	2018-12-07 12:21:10 -03: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
soupette	0cc6b76b58	Lint	2018-12-07 00:18:50 +01:00
soupette	52e5f87cd3	Fix post schema	2018-12-07 00:14:59 +01:00
soupette	924aa079d8	Add build to travis and fix travis lint	2018-12-06 23:32:17 +01:00
soupette	85c3e81353	Fix typo and recreate doc when deleting a ct	2018-12-06 23:20:18 +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
Aurélien Georget	53b195c917	Avoid useless population	2018-12-06 19:12:31 +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
Aurélien Georget	ebf9cfdcaa	Handle one-to-many case	2018-12-06 18:23:56 +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
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