1099 Commits

Author	SHA1	Message	Date
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
soupette	9e9353cba4	Fix count number on delete	2018-04-09 15:58:22 +02:00
soupette	c562c79430	Fix lag in preview	2018-04-09 15:52:58 +02:00
Aurelsicoko	0f581fa5c3	Be able to retrieve polymorphic association using GraphQL (File Upload)	2018-04-05 15:20:24 +02:00
Jim Laurie	ee12536e84	3.0.0-alpha.11.3	2018-04-05 14:13:50 +02:00
soupette	ff4253aeea	Fix conflict and fix focus bug in WYSIWYG	2018-04-04 17:51:41 +02:00
Jim Laurie	43d6a9af9c	Hotfix params bookshelf filters again :/	2018-04-03 18:12:20 +02:00
Jim Laurie	cd8fd85f12	Hotfix params bookshelf filters	2018-04-03 17:04:10 +02:00
Jim Laurie	5948e9fa5c	Update content manager filter	2018-04-03 13:03:41 +02:00
Aurelsicoko	66b75801c7	Add contains query and be able to disabled specific query	2018-04-03 11:30:39 +02:00
Adrien Lepoutre	0b0ea75402	ISSUE 825 - Losing OneToOne relation in the content manager - Fixes #825	2018-04-02 17:50:03 -04:00
Aurelsicoko	e917c61b02	Optimize GraphQL query with Bookshelf	2018-04-02 19:24:36 +02:00
Aurelsicoko	920ced6ce7	Resolve conflicts	2018-04-02 16:40:40 +02:00
Jim LAURIE	b9eea87885	Merge branch 'master' into ctb-default-value	2018-04-02 11:27:56 +02:00
soupette	7d718c9627	Add react-loadable and fix wysiwyg css	2018-04-02 11:18:05 +02:00
soupette	86bc73e9d1	Fix conflict	2018-04-02 09:50:58 +02:00
Aurelsicoko	74ad7ffa0c	Handle relationship in GraphQL query	2018-03-31 18:55:08 +02:00
Inder Redni	1e914be7b7	polish language | update	2018-03-30 19:00:06 +02:00
soupette	0c8769138c	Fix conflict	2018-03-30 13:00:03 +02:00
Jim Laurie	8390106f59	3.0.0-alpha.11.2	2018-03-27 17:59:16 +02:00
cyril lopez	37eedd5747	Fix pagination	2018-03-27 10:27:50 +02:00
cyril lopez	b1e39929de	Fixes #850	2018-03-27 10:13:13 +02:00
cyril lopez	f6c0061334	Allow default values for attributes	2018-03-26 15:25:32 +02:00
cyril lopez	4704d0c004	Add default value when creating a record in ctm	2018-03-26 12:31:48 +02:00
cyril lopez	8be6df24b3	Fix PR feedback	2018-03-23 17:11:10 +01:00
cyril lopez	f0298b1566	Remove old layout	2018-03-20 16:20:50 +01:00
cyril lopez	0952c9aaa9	Add new layout dynamic	2018-03-19 12:30:04 +01:00
cyril lopez	67cb54ae12	Add request to fetch layout in ctm	2018-03-19 11:57:47 +01:00
cyril lopez	63575565b1	Merge branch 'master' of github.com:strapi/strapi into wysiwyg	2018-03-15 22:20:54 +01:00