777 Commits

Author	SHA1	Message	Date
Jim Laurie	a6c0616dfc	Handle update type	2018-04-27 13:47:09 +02:00
Jim LAURIE	1850d5539b	Merge branch 'master' into improve-webpack-config	2018-04-26 14:20:10 +02:00
Jim Laurie	273f22c70d	Fix entry value	2018-04-26 14:10:17 +02:00
Jim Laurie	1ee8d9b30a	Fix PR feedback - handle type float	2018-04-26 13:47:40 +02:00
soupette	611dfb32eb	Merge branch 'master' of github.com:strapi/strapi into sql-xp	2018-04-26 10:26: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
Aurelsicoko	265fb1bdd9	Fix beforeCreate lifecycle	2018-04-25 12:23:53 +02:00
Jim Laurie	8d2a46cd0c	Fix conflict timestamp	2018-04-25 11:06:12 +02:00
Jim Laurie	ad32122a27	Create many to many table	2018-04-24 17:48:15 +02:00
Jim LAURIE	8139325672	Merge branch 'master' into mongoose/decimal	2018-04-24 15:40:18 +02:00
Aurelsicoko	edf0f97678	Improve Decimal128 and Float support with MongoDB	2018-04-24 15:24:42 +02:00
Jim LAURIE	65d49d0da2	Merge branch 'master' into fix-763	2018-04-24 12:09:58 +02:00
soupette	6b3e3d472f	Improve errors notifications	2018-04-24 11:45:09 +02:00
soupette	b713648d4c	Fixes #763	2018-04-24 10:13:09 +02:00
Jim LAURIE	045a942e23	Merge branch 'master' into issues/924	2018-04-23 16:13:59 +02:00
Jim LAURIE	a77adb5b6a	Merge branch 'master' into fix-search-select	2018-04-23 13:36:01 +02:00
Aurelsicoko	99f2b34549	Fix loose of file relation & select latest associated file	2018-04-23 12:59:53 +02:00
Jim LAURIE	36393b9594	Merge branch 'master' into reduce-setup-monorepo	2018-04-23 12:32:01 +02:00
soupette	85836ee5be	Remove useless requestUrlSuffix	2018-04-23 11:36:21 +02:00
soupette	2817ad6a33	Fixes #979	2018-04-20 10:49:05 +02:00
soupette	44d3519130	remove relations	2018-04-19 17:23:23 +02:00
soupette	5a9e9ef53b	Fixes #959	2018-04-19 17:19:56 +02:00
soupette	02dac8e579	Undo ctm service modifications	2018-04-19 15:52:51 +02:00
soupette	81383f3562	Fixes #959	2018-04-19 15:45:35 +02:00
soupette	21e45890db	Fixes #964	2018-04-18 14:25:56 +02:00
Jim Laurie	ebd144fddb	3.0.0-alpha.12	2018-04-18 12:03:16 +02:00
cyril lopez	77bc3975c4	Merge branch 'master' into reduce-setup-monorepo	2018-04-18 11:54:36 +02:00
Aurelsicoko	f7b41dbc01	Fix uploaded file on create	2018-04-17 17:50:23 +02:00
soupette	fcc374c3fd	Fix conflicts	2018-04-17 11:50:52 +02:00
soupette	7b87af5e1b	Remove prebuild test and update documentation	2018-04-17 11:49:09 +02:00
Jim LAURIE	c0ea8fa807	Merge branch 'master' into graphql	2018-04-16 16:39:50 +02:00
Administrator	d030dc06ba	Russian language pack update. Admin translations fixes + Content manager translations added.	2018-04-15 13:30:31 +03:00
Aurelsicoko	87b07c8eeb	Resolve conflicts	2018-04-13 18:04:03 +02:00
soupette	795993a9b6	Empty ctm layout.json	2018-04-13 15:14:11 +02:00
soupette	f7cbfbf1db	Merge branch 'graphql' of github.com:strapi/strapi into graphql	2018-04-13 14:44:25 +02:00
soupette	a66ca698ee	Fix hook bug and remove useless admin containers	2018-04-13 14:37:46 +02:00
Aurelsicoko	aaac5ba391	Clean code	2018-04-13 14:27:50 +02:00
Jim LAURIE	950122dbdb	Merge branch 'master' into poly-cm	2018-04-12 17:58:51 +02:00
Aurelsicoko	0ac7c435f3	Merge branch 'master' of github.com:strapi/strapi into graphql	2018-04-12 16:37:23 +02:00
Aurelsicoko	73764d6ae0	Add containss in Bookshelf filters	2018-04-12 15:44:04 +02:00
Jim LAURIE	6e843dad3e	Merge branch 'master' into wysiwyg-preview-fullscreen	2018-04-12 15:02:13 +02:00
Jan Brachhold	d986055fb8	Update german translations	2018-04-11 21:19:31 +02:00
Jim LAURIE	80922afd79	Merge branch 'master' into ISSUE-825	2018-04-11 18:52:27 +02:00
Adrien Lepoutre	2496611fca	Code cleaning	2018-04-11 10:09:53 -04:00
Aurelsicoko	17c46b331d	Make GraphQL polymorphic relationships working with Bookshelf	2018-04-11 12:53:07 +02:00
Aurelsicoko	cd43c2851b	Build schema.graphql to query Users & Permissions models	2018-04-10 15:54:34 +02:00
Jim Laurie	bdd1583543	Handle polymorphic in admin ... Only for collection: * poly side	2018-04-10 14:46:36 +02:00
Aurelsicoko	26be155f09	Await promises before returning values	2018-04-10 12:56:13 +02:00
soupette	81109f558e	Fix conflict	2018-04-10 11:18:04 +02:00