6761 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jim LAURIE	5f7aa5c770	Merge pull request #1267 from johannpinson/patch-ui-table ... Fix UI min-height in content-type table list	2018-05-28 16:21:38 +02:00
soupette	1b5be59745	Fix css	2018-05-28 16:13:17 +02:00
Jim LAURIE	f9b3f27c6f	Merge branch 'master' into patch-ui-table	2018-05-28 16:03:49 +02:00
Jim LAURIE	5530f113d2	Merge pull request #1268 from johannpinson/patch-ui-admin ... Fix UI modal position in admin	2018-05-28 16:03:36 +02:00
Johann Pinson	28b2512484	fix(admin): handle click if specified - update PropTypes	2018-05-28 15:47:51 +02:00
Jim LAURIE	d85ecc707f	Merge branch 'master' into patch-ui-admin	2018-05-28 15:45:00 +02:00
Jim LAURIE	fc9f77f803	Merge pull request #1285 from strapi/enhancement/doc ... Add section tracking documentation	2018-05-28 15:44:46 +02:00
Jim LAURIE	61571505ee	Merge branch 'master' into enhancement/doc	2018-05-28 15:34:14 +02:00
cyril lopez	44359b921a	Update usage-tracking.md	2018-05-28 15:32:48 +02:00
cyril lopez	b250bc9198	Update SUMMARY.md	2018-05-28 15:27:57 +02:00
soupette	985739c660	Update build	2018-05-28 15:22:02 +02:00
Jim LAURIE	bb514d48ce	Merge pull request #1199 from okaris/oneway-relation-frontend ... Added oneWay relation option on frontend	2018-05-28 15:19:13 +02:00
Jim LAURIE	5d89f1ef2f	Merge branch 'master' into oneway-relation-frontend	2018-05-28 15:09:52 +02:00
soupette	22bf58485e	Merge branch 'master' of github.com:strapi/strapi into content-manager-filters	2018-05-28 14:59:32 +02:00
Aurelsicoko	4ca24a37de	Add usage tracking link in the menu #1280	2018-05-28 14:39:02 +02:00
Aurelsicoko	88857db65d	Add usage tracking section	2018-05-28 14:35:06 +02:00
Jim LAURIE	890db5970f	Merge pull request #1248 from raulriera/fix-typo ... Fix a typo in the error key	2018-05-28 12:26:30 +02:00
Kamal Bennani	ee89659347	fix lint	2018-05-26 18:46:56 +02:00
Kamal Bennani	67f74a8473	Fall through when the current model doesn't host the entities (not populated by default)	2018-05-26 18:46:26 +02:00
Jim LAURIE	cd42dcded2	Merge branch 'master' into fix-typo	2018-05-25 18:09:03 +02:00
soupette	1addba7398	Fixes #1231	2018-05-25 17:54:16 +02:00
Aurelsicoko	a7a1143523	Update doc and pass depthLimit in config	2018-05-25 17:40:03 +02:00
soupette	5ec54d522c	Remove comment	2018-05-25 17:30:19 +02:00
soupette	5366b1c6ad	GraphQL filters	2018-05-25 17:03:43 +02:00
Jim LAURIE	2844d34ad1	Merge pull request #1266 from johannpinson/patch-graphql-timestamp ... Change names for timestamp fields in GraphQL plugin	2018-05-25 16:46:54 +02:00
Jim Laurie	519f4344c9	Add releation update tests	2018-05-25 16:36:50 +02:00
Jim LAURIE	e68bfba121	Merge branch 'master' into patch-graphql-timestamp	2018-05-25 16:24:22 +02:00
Aurelsicoko	217aae2d1b	Fixes #1058 - Amount limiting and depth limiting	2018-05-25 16:08:51 +02:00
soupette	48514fa8c4	Fix strapi utils convert params function	2018-05-25 15:57:07 +02:00
Aurelsicoko	3805f3bc95	Fixes #1164	2018-05-25 15:31:30 +02:00
Aurelsicoko	1f2a0e5b8b	Fixes #1174	2018-05-25 15:23:13 +02:00
soupette	688f44be7c	Fix inputCheckbox proptypes	2018-05-25 14:43:04 +02:00
soupette	c95be9312d	Merge branch 'fix/graphql' of github.com:strapi/strapi into content-manager-filters	2018-05-25 13:33:52 +02:00
soupette	3847fd8c67	Fix filter for decimal	2018-05-25 13:21:57 +02:00
soupette	88d5cc2c37	Merge branch 'master' of github.com:strapi/strapi into content-manager-filters	2018-05-25 12:23:55 +02:00
Jim Laurie	d6b036074e	Add delete API tests	2018-05-25 11:49:46 +02:00
Raul Riera	50cdabd5c9	Merge branch 'master' into additional-variables-mongoose	2018-05-24 21:45:37 -04:00
Jim LAURIE	40d5860d21	Merge pull request #1260 from johannpinson/patch-3 ... Fix generate GraphQL schema if ShadowCRUD is false	2018-05-24 19:26:13 +02:00
Jim LAURIE	93eb13e7dd	Merge branch 'master' into patch-3	2018-05-24 18:58:26 +02:00
Jim LAURIE	ab78d0a121	Merge pull request #1261 from johanbaath/fix-duplicate-permissions ... Fix clean up of duplicate permissions	2018-05-24 18:58:09 +02:00
Jim LAURIE	b291cf1ab8	Merge branch 'master' into fix-duplicate-permissions	2018-05-24 18:48:05 +02:00
Jim LAURIE	88c598450c	Merge pull request #1245 from johannpinson/patch-2 ... Update Union type creation rules for GraphQL	2018-05-24 18:47:25 +02:00
Aurelsicoko	71ade27999	Fixes #1232	2018-05-24 18:41:36 +02:00
Jim LAURIE	27d37f970f	Merge branch 'master' into patch-2	2018-05-24 18:37:54 +02:00
Johann Pinson	4e8e495275	fix(admin): adjust modal size + position #1062	2018-05-24 18:29:19 +02:00
soupette	eecccbcbd8	Remove Json from available filters	2018-05-24 18:15:35 +02:00
Johann Pinson	93151ac2e2	fix(ui): add min-height for line in table content-type-builder #1076	2018-05-24 17:51:55 +02:00
soupette	81a96bcc46	Unmount InputWithAutofocus after close	2018-05-24 17:49:17 +02:00
Aurelsicoko	c111aaba13	Fixes #1247	2018-05-24 17:20:32 +02:00
Johann Pinson	534fa00c0b	fix(graphql): change timestamp format snake_case to camelCase	2018-05-24 17:13:14 +02:00