6761 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
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
Pierre Burgy	6714326d7c	Add sponsors	2018-12-04 09:33:43 +01:00
soupette	66e45eb896	Change cypress test folder name	2018-12-03 12:06:09 +01:00
soupette	43e02ffb3d	Merge branch 'master' of github.com:strapi/strapi into add-cypress	2018-12-03 11:24:03 +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