6459 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
almera	497d428f0a	Fix Identation	2018-12-13 07:35:42 -05:00
almera	5350c623d1	Fix so you can choose multiple domains for the cors	2018-12-11 08:06:50 -05: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
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
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
Pierre Burgy	6714326d7c	Add sponsors	2018-12-04 09:33:43 +01:00
Jim LAURIE	44e3154cef	Remove .npmignore from generated files close #823	2018-12-01 16:44:56 +01:00
Jim LAURIE	c92a90baa8	Merge pull request #2400 from derrickmehaffy/graphqlCustomLimit ... Add GraphQL custom security limit	2018-11-30 16:32:03 +01:00
Jim LAURIE	f2e5f1e2df	Merge branch 'master' into graphqlCustomLimit	2018-11-30 16:31:55 +01:00
Jim LAURIE	9bcbd61c1b	Merge pull request #2401 from DrAAA-X/master ... Fix typo documentation & update RU translations	2018-11-30 15:48:31 +01:00
Kirill	3ba07e3c74	translation fix	2018-11-29 22:15:48 +03:00
Kirill	ef9d2e0633	Fix typo	2018-11-29 19:17:50 +03:00
Kirill	9db8c88d74	Fix typo	2018-11-29 17:57:04 +03:00
DMehaffy	49174d35dd	Grammer fix	2018-11-29 05:17:39 -07:00
DMehaffy	3e1c4b5857	Fix typo	2018-11-29 05:16:58 -07:00
DMehaffy	249b2f87ed	Add docs reference	2018-11-29 05:15:50 -07:00
Jim LAURIE	b77c3bbf07	Merge pull request #2351 from sajjad-shirazy/master ... Fix Float or Decimal fields on Mongoose	2018-11-29 12:11:26 +01: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	0d9293e840	Merge pull request #2258 from Leo1003/master ... Updated ZH translations	2018-11-29 11:45:51 +01:00
Jim LAURIE	f2ec28907e	Merge branch 'master' into master	2018-11-29 11:45:42 +01:00
Jim LAURIE	511d913abf	Merge pull request #2391 from derrickmehaffy/fixNodeVersions ... Update Package.json Node and NPM Versions to current LTS	2018-11-29 11:22:05 +01:00
Jim LAURIE	c126b94325	Merge branch 'master' into fixNodeVersions	2018-11-29 11:21:55 +01:00
Jim LAURIE	4f6236320e	Merge pull request #2395 from strapi/eslint/fix-indent-cond-expr ... Fix eslint inline condition error	2018-11-28 19:31:45 +01:00
Jim LAURIE	a35ba3c6ca	Merge branch 'master' into eslint/fix-indent-cond-expr	2018-11-28 19:31:34 +01:00
Jim LAURIE	2d3b3d6d7f	Merge pull request #2392 from mnlbox/master ... Add Productboard link to CONTRIBUTING.md	2018-11-28 19:26:37 +01:00
Jim LAURIE	409a726f64	Merge branch 'master' into master	2018-11-28 19:26:30 +01:00
Jim LAURIE	2b6c161134	Merge pull request #2390 from dorelljames/patch-1 ... Fix upload for videos and other format Cloudinary	2018-11-28 19:25:11 +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	2ddc5f5ac8	Merge pull request #2394 from strapi/3.0.0-alpha.15 ... 3.0.0-alpha.15	2018-11-28 15:00:13 +01:00
Jim LAURIE	fb03d4f18c	3.0.0-alpha.15 v3.0.0-alpha.15	2018-11-28 14:55:41 +01:00
mnlbox	8f44b07883	add productboard link to CONTRIBUTING.md	2018-11-28 15:31:57 +03:30
DMehaffy	af90d61ecf	Update README and Bug Template	2018-11-28 00:30:04 -07:00