7150 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
Aurélien Georget	b0aaae9f12	Resolve conflicts	2018-11-27 18:48:37 +01:00
Jim LAURIE	3347caf7f1	Merge pull request #2385 from strapi/deprecated-providers ... Deprecated providers	2018-11-27 17:37:20 +01:00
Jim LAURIE	2afb30b2f9	Deprecated providers	2018-11-27 17:30:35 +01:00
Jim LAURIE	2798e33774	Merge pull request #2384 from strapi/fix-fetch-user ... Fix fetch user mongoose	2018-11-27 16:53:13 +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	e706339d53	Merge pull request #2356 from henrych4/fix-missing-contentType-in-content-manager ... Fix missing content type in content manager sometimes	2018-11-27 15:48:52 +01:00
Jim LAURIE	48a07fde4d	Merge branch 'master' into fix-missing-contentType-in-content-manager	2018-11-27 15:44:28 +01:00
Aurélien Georget	540e1bccf8	Allow private attribute into input definition	2018-11-27 14:59:28 +01:00
Aurélien Georget	9e0faf9b5c	Fix deleteUser mutation for Mongoose and Bookshelf	2018-11-27 14:54:34 +01:00
Jim LAURIE	e5654758cc	Merge pull request #2382 from strapi/fix-delete-all ... Fix delete all	2018-11-27 14:52:41 +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
Jim LAURIE	cd572b0f80	Merge branch 'master' into fix-missing-contentType-in-content-manager	2018-11-27 13:34:32 +01:00
Jim LAURIE	c30991668a	Merge pull request #2325 from strapi/fix/hidden-fields-schema ... Remove hidden fields from the schema	2018-11-27 12:37:04 +01:00
soupette	0aa7796a82	Merge branch 'master' of github.com:strapi/strapi into add-cypress	2018-11-27 12:27:18 +01:00
Jim LAURIE	70e5816f46	Merge branch 'master' into fix/hidden-fields-schema	2018-11-27 12:19:04 +01:00
Jim LAURIE	ee6ad1e5b0	Merge pull request #2379 from strapi/fix/build ... Lock babel dependencies version until I found the dependency to update	2018-11-26 19:18:56 +01:00
Aurélien Georget	143f92a338	Follow generated GraphQL input to return data	2018-11-26 18:32:35 +01:00
soupette	547563f56f	Lock babel dependencies version until I found the dependency to update	2018-11-26 18:18:49 +01:00
Aurélien Georget	6fd3319f18	Generate different input for edit mutation	2018-11-26 17:36:49 +01:00