33691 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Jim LAURIE	56219de01a	Merge pull request #1014 from strapi/fix-763 ... Add corresponding errors when duplicate email	2018-04-24 12:19:18 +02:00
Pongstr	d797d5f7b0	PR Updates ... - renamed readme title - removed strapi-upload-aws-s3 and strapi-upload-rackspace from setup	2018-04-24 13:13:59 +03:00
Jim LAURIE	65d49d0da2	Merge branch 'master' into fix-763	2018-04-24 12:09:58 +02:00
Herbert Lin	a717faa817	Merge branch 'master' of https://github.com/XcrossD/strapi	2018-04-24 18:00:52 +08:00
Herbert Lin	0db8f05e8b	Temp fix for LeftMenuFooter style.	2018-04-24 17:59:30 +08:00
soupette	6b3e3d472f	Improve errors notifications	2018-04-24 11:45:09 +02:00
Jim LAURIE	f2cb6d7af8	Merge branch 'master' into master	2018-04-24 11:29:39 +02:00
Pongstr Ordillo	2931ad5315	Merge branch 'master' into strapi-upload-rackspace	2018-04-24 11:45:07 +03:00
soupette	b713648d4c	Fixes #763	2018-04-24 10:13:09 +02:00
Jim LAURIE	988a8d530d	Merge pull request #1001 from strapi/issues/924 ... Fix loose of file relation & select latest associated file	2018-04-24 10:06:45 +02:00
Pongstr	2f95a073c7	Add Rackspace Upload Provider	2018-04-24 09:23:59 +03:00
Jim LAURIE	6040968b74	Merge branch 'master' into issues/924	2018-04-23 23:53:15 +02:00
Jim LAURIE	867a2997e2	Merge pull request #1003 from strapi/enhance/mongoose_events ... Use latest release of Mongoose & add comment to explain post remove c…	2018-04-23 23:52:32 +02:00
Jim LAURIE	724b9e2f05	Merge branch 'master' into enhance/mongoose_events	2018-04-23 23:42:49 +02:00
Jim LAURIE	be6067928c	Merge pull request #1004 from strapi/fix/919 ... Update Mongoose template & support one-way in generated API	2018-04-23 23:42:38 +02:00
Jim LAURIE	f580b470b6	Merge branch 'master' into enhance/mongoose_events	2018-04-23 23:38:04 +02:00
Jim Laurie	b34ac11e10	Create table and create missing columns from strapi-bookshelf	2018-04-23 18:58:48 +02:00
soupette	7f353bb94a	Configurate extract-text-webpack-plugin	2018-04-23 18:25:12 +02:00
Aurelsicoko	892f9d1291	Update Mongoose template & support one-way in generated API	2018-04-23 16:57:59 +02:00
soupette	9b9aadcabd	Remove sourceMap	2018-04-23 16:41:48 +02:00