4500 Commits

Author SHA1 Message Date
Jim LAURIE
bae8073c7b
Merge pull request #1181 from raulriera/additional-variables-mongoose
Support for passing additional variables into mongoose
2018-05-30 10:41:11 +02:00
Jim LAURIE
916c683e8d
Merge branch 'master' into additional-variables-mongoose 2018-05-30 10:02:50 +02:00
Jim LAURIE
f1a947eeaa
Merge pull request #1294 from johannpinson/patch-5
Fix toJSON verification inside bookshelf for content-manager
2018-05-30 10:02:10 +02:00
Raul Riera
156ed25265
Merge branch 'master' into additional-variables-mongoose 2018-05-29 16:28:22 -04:00
Jim LAURIE
70baca0a14
Merge branch 'master' into patch-5 2018-05-29 21:58:45 +02:00
Jim LAURIE
df324801e5
Merge pull request #1275 from strapi/fix/graphql
Improve GraphQL query support
2018-05-29 21:58:11 +02:00
Jim LAURIE
9a6d4330c1
Merge branch 'master' into additional-variables-mongoose 2018-05-29 21:27:18 +02:00
Jim LAURIE
aee7157d5a
Merge branch 'master' into fix/graphql 2018-05-29 21:09:57 +02:00
Johann Pinson
de691ca47f
Fix toJSON verification 2018-05-29 15:08:43 +02:00
Jim LAURIE
11bab474ed
Merge pull request #1265 from johannpinson/patch-input-ui
Fix ui helper field width inside content type builder
2018-05-28 16:49:42 +02:00
Jim LAURIE
f3df2fa77f
Merge branch 'master' into patch-input-ui 2018-05-28 16:21:57 +02:00
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
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
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
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
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
Jim LAURIE
cd42dcded2
Merge branch 'master' into fix-typo 2018-05-25 18:09:03 +02:00
Aurelsicoko
a7a1143523 Update doc and pass depthLimit in config 2018-05-25 17:40:03 +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
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
Aurelsicoko
3805f3bc95 Fixes #1164 2018-05-25 15:31:30 +02:00
Aurelsicoko
1f2a0e5b8b Fixes #1174 2018-05-25 15:23:13 +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
Johann Pinson
93151ac2e2 fix(ui): add min-height for line in table content-type-builder #1076 2018-05-24 17:51:55 +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
Johann Pinson
340aecc743 fix(ui): input min-width for helper #1214 2018-05-24 17:06:47 +02:00
Johann Pinson
e71063920f
Fix generate GraphQL schema if ShadowCRUD is false 2018-05-23 14:27:23 +02:00
Johan Baath
1cdb1dfc76 fix clean up of duplicate permissions 2018-05-23 14:25:32 +02:00
Jim LAURIE
acbf4581aa
Merge branch 'master' into fix-typo 2018-05-22 17:06:13 +02:00
Raul Riera
0e4c6064ce Updated content type builder 2018-05-22 08:38:08 -04:00
Jim LAURIE
0a9fff5a30
Merge pull request #1249 from strapi/update-issue-template
Remove issue template checkbox
2018-05-22 14:17:12 +02:00
Jim Laurie
7056a6d65b Remove issue template checkbox 2018-05-22 14:16:25 +02:00