6761 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
soupette	64984fded5	Fixes #860	2018-04-26 13:27:28 +02:00
soupette	d2b6667666	Fix menu footer css	2018-04-26 11:27:37 +02:00
soupette	42c64091e2	Fixes 770	2018-04-26 11:24:47 +02:00
soupette	611dfb32eb	Merge branch 'master' of github.com:strapi/strapi into sql-xp	2018-04-26 10:26:09 +02:00
Jim LAURIE	09c403f79b	Merge pull request #1035 from pedrocruzio/patch-1 ... Fixed misspelling in documentation text	2018-04-26 00:28:39 +02:00
Pedro Cruz	ce52ad4fb4	Fixed misspelling in documentation text	2018-04-25 14:14:47 -04:00
soupette	9e876370e0	Add comments	2018-04-25 17:27:09 +02:00
soupette	b7fffb0ce7	Fixes #958	2018-04-25 16:34:20 +02:00
Jim Laurie	dcf020662c	Fix manyToMany content manager	2018-04-25 15:40:49 +02:00
Jim LAURIE	1cdca712f7	Merge pull request #1026 from stephledev/master ... check if `strapi start` runs inside a strapi project	2018-04-25 14:59:40 +02:00
soupette	fb35bc75e0	Fix monorepo setup	2018-04-25 14:59:28 +02:00
Jim LAURIE	ffb0b93d3d	Merge branch 'master' into master	2018-04-25 14:35:33 +02:00
soupette	0a9f81765e	Add new commands to fix npm run setup inside a project	2018-04-25 14:33:38 +02:00
Jim LAURIE	a274a6fb62	Merge pull request #1030 from strapi/fix-config-setup-up ... Fix prevGrantConfig equal undefined when config not exist in db	2018-04-25 14:33:19 +02:00
Jim LAURIE	d94be998a4	Fix prevGrantConfig equal undefined when config not exist in db	2018-04-25 14:12:24 +02:00
Jim LAURIE	56e16bb62e	Merge pull request #1029 from derrickmehaffy/fix-v12-docs ... Update v12 Readme.md	2018-04-25 14:02:29 +02:00
DMehaffy	8e81dfb27a	Update v12 Readme.md ... Updated reference to alpha.12	2018-04-25 04:50:20 -07:00
Jim LAURIE	246dd7b466	Merge pull request #1028 from strapi/fix/lifecycle ... Fix beforeCreate lifecycle	2018-04-25 12:36:12 +02:00
Jim LAURIE	e6ad7de20e	Merge branch 'master' into fix/lifecycle	2018-04-25 12:27:33 +02:00
Jim Laurie	7488434f42	Remove updated and created at from model attributes	2018-04-25 12:25:20 +02:00
Aurelsicoko	265fb1bdd9	Fix beforeCreate lifecycle	2018-04-25 12:23:53 +02:00
Jim Laurie	29dab8fbb5	Fix #1013	2018-04-25 12:17:45 +02:00
stephledev	caa7e2cee2	check if strapi start runs inside a strapi project	2018-04-25 11:12:54 +02:00
Jim Laurie	8d2a46cd0c	Fix conflict timestamp	2018-04-25 11:06:12 +02:00
Jim LAURIE	f716d0f4e5	Merge pull request #1021 from strapi/improve/ctb ... Reorder model root attributes and remove "multiple" key	2018-04-24 18:59:45 +02:00
Jim LAURIE	4b508c8c39	Merge branch 'master' into improve/ctb	2018-04-24 18:10:50 +02:00
Jim LAURIE	e72a9b27e5	Merge pull request #1020 from strapi/enhance/generate ... Move authentication and ssl in database options	2018-04-24 18:10:38 +02:00
Jim Laurie	ad32122a27	Create many to many table	2018-04-24 17:48:15 +02:00
Jim LAURIE	60eb9cf9d5	Merge branch 'master' into enhance/generate	2018-04-24 17:45:53 +02:00
Jim LAURIE	8bce274496	Merge pull request #996 from XcrossD/master ... Update LeftMenuFooter style	2018-04-24 17:45:32 +02:00
Jim LAURIE	8a59fca0d1	Merge branch 'master' into master	2018-04-24 17:22:21 +02:00
Jim LAURIE	ee99a4ce80	Merge pull request #991 from zhuang17/reload-grant-config-when-changed ... reload grant auth config into db when add/delete grant provider	2018-04-24 17:21:39 +02:00
Aurelsicoko	7a456da974	Move authentication and ssl in database options	2018-04-24 16:38:19 +02:00
Zhuang	5718a04bb8	Merge branch 'master' of https://github.com/strapi/strapi into reload-grant-config-when-changed	2018-04-24 22:20:21 +08:00
Jim Laurie	efdcc4cde9	Fix morph table creation	2018-04-24 16:19:17 +02:00
Aurelsicoko	1618d3f858	Reorder model root attribute and remove multiple key	2018-04-24 16:19:02 +02:00
Zhuang	d23ebfeaf0	merge the previous provider config	2018-04-24 22:18:21 +08:00
Jim LAURIE	6e9dc44aa0	Merge pull request #1017 from strapi/enhance/ctb ... Ignore file model in the CTB	2018-04-24 16:06:28 +02:00
Jim LAURIE	c051b58022	Merge branch 'master' into enhance/ctb	2018-04-24 15:57:16 +02:00
Jim LAURIE	1c03f63465	Merge pull request #1019 from strapi/mongoose/decimal ... Improve Decimal128 and Float support with MongoDB	2018-04-24 15:56:49 +02:00
Jim LAURIE	8139325672	Merge branch 'master' into mongoose/decimal	2018-04-24 15:40:18 +02:00
Jim Laurie	d6c16f2373	Add comments and clean code	2018-04-24 15:34:26 +02:00
Jim Laurie	1ae9e65b42	Upload setup in bookshelf and create morph tables	2018-04-24 15:24:48 +02:00
Aurelsicoko	edf0f97678	Improve Decimal128 and Float support with MongoDB	2018-04-24 15:24:42 +02:00
Jim Laurie	79ddc27cb1	U&P setup in bookshelf and handle oneToMany relation	2018-04-24 14:29:28 +02:00
Aurelsicoko	da1ead5e7b	Ignore file model in the CTB	2018-04-24 14:19:07 +02:00
soupette	8db7e1ef30	Merge branch 'master' of github.com:strapi/strapi into improve-webpack-config	2018-04-24 13:41:37 +02:00
Jim LAURIE	deeff1272e	Merge pull request #1012 from pongstr/strapi-upload-rackspace ... Add Rackspace Upload Provider	2018-04-24 12:31:48 +02:00
Jim Laurie	b7a2778e89	Change core store setup	2018-04-24 12:30:43 +02:00
Jim LAURIE	e015270a32	Merge branch 'master' into strapi-upload-rackspace	2018-04-24 12:19:54 +02:00