Jim Laurie
c82ba4c089
Fix decimal on pg an mysql fix #1273
2018-06-04 18:22:21 +02:00
Jim LAURIE
6de61bd2d6
Merge pull request #1311 from strapi/test-suits
...
Test suits first round
2018-06-04 15:11:59 +02:00
Jim LAURIE
047a887f49
Merge branch 'master' into test-suits
2018-06-04 14:52:41 +02:00
Jim Laurie
78e064e72c
Fix missing file
2018-06-04 14:49:21 +02:00
Jim Laurie
c9b4e29c65
Merge branch 'test-suits' of github.com:strapi/strapi into test-suits
2018-06-04 14:43:09 +02:00
Jim Laurie
ec5ef9a240
Fix PR feedback
2018-06-04 14:39:26 +02:00
Jim LAURIE
7c915f2170
Merge pull request #1298 from strapi/fix-cors-option
...
Fix cors on option request
2018-06-04 14:28:31 +02:00
Jim LAURIE
cff5c248a9
Merge branch 'master' into fix-cors-option
2018-06-04 12:06:24 +02:00
Jim LAURIE
3d3d75b135
Merge branch 'master' into test-suits
2018-06-03 20:59:57 +02:00
Jim Laurie
8085a2deaf
Update oneToOne test with id
2018-06-03 20:46:43 +02:00
Jim LAURIE
6bf7542dc0
Merge pull request #1310 from nurikabe/patch-3
...
Specify MongoDB >= 2.6
2018-06-03 14:53:35 +02:00
Evan Owens
238b3f9b4a
Specify MongoDB >= 2.6
...
Need to use MongoDB >= 2.6 otherwise get wire version errors on start:
```
UnhandledPromiseRejectionWarning: MongoError: Server at 127.0.0.1:27017 reports wire version 0, but this version of Node.js Driver requires at least 2 (MongoDB2.6).
```
2018-06-01 23:57:06 -04:00
Jim LAURIE
32158a20f1
Merge pull request #1302 from strapi/fix-add-ct
...
Fix add multi column for mysql
2018-06-01 16:07:38 +02:00
Jim LAURIE
d515177c4a
Merge branch 'master' into fix-add-ct
2018-06-01 15:49:57 +02:00
Jim Laurie
f284c5d3e0
Fix PR feedback
2018-06-01 15:49:08 +02:00
Jim Laurie
676334d03d
Launch test with mongo postgres and mysql
2018-06-01 14:31:30 +02:00
Jim LAURIE
eef8478533
Merge pull request #1279 from kamalbennani/bugfix/graphql-returns-empty-array-when-entities-are-not-hosted-by-the-model
...
GraphQL returns empty array when entities are not hosted by the model
2018-06-01 11:51:25 +02:00
Jim LAURIE
16c958f32f
Merge branch 'master' into bugfix/graphql-returns-empty-array-when-entities-are-not-hosted-by-the-model
2018-06-01 11:37:58 +02:00
Jim LAURIE
65d586b3d4
Merge pull request #1299 from strapi/fix-boolean-mysql
...
Convert 1/0 to true/false for mysql
2018-06-01 11:37:44 +02:00
Jim LAURIE
5199273be2
Merge branch 'master' into fix-boolean-mysql
2018-06-01 11:20:35 +02:00
Jim LAURIE
d55749cde2
Merge pull request #1307 from okaris/count-route-controller-service-bookshelf
...
Added count to api template for bookshelf
2018-06-01 10:58:08 +02:00
Okaris
d5cca40270
Added count to api template for bookshelf
2018-06-01 08:16:54 +03:00
Jim LAURIE
81488b86f0
Merge pull request #1305 from strapi/remove-info-db-ctb
...
Remove warning in content-type-builder when creating tables
2018-05-31 19:53:14 +02:00
Jim LAURIE
524999e451
Merge branch 'master' into remove-info-db-ctb
2018-05-31 19:04:12 +02:00
Kamal Bennani Bouchiba
ff2543652f
Merge branch 'master' into bugfix/graphql-returns-empty-array-when-entities-are-not-hosted-by-the-model
2018-05-31 17:06:45 +02:00
soupette
7f4488f65f
Remove NoTableWarning int ctb since we automatically creates table
2018-05-31 16:14:08 +02:00
Jim LAURIE
f9b65b2e83
Merge pull request #1170 from marcostephan/third-party-windows-auth
...
Fix third party auth providers always disabled on windows
2018-05-31 16:06:31 +02:00
Jim LAURIE
a9d725c74c
Merge branch 'master' into third-party-windows-auth
2018-05-31 14:54:51 +02:00
Jim LAURIE
b52f68a3ef
Merge pull request #1293 from okaris/count-route-controller-service
...
Add count route on generated API
2018-05-31 14:50:19 +02:00
Jim LAURIE
7a1e050526
Merge branch 'master' into count-route-controller-service
2018-05-31 14:33:35 +02:00
Jim LAURIE
033127105d
Merge pull request #1276 from johannpinson/patch-content-manager
...
Improve <Ico> component for handle click if specified
2018-05-31 14:27:50 +02:00
Jim LAURIE
1d44f6c271
Merge branch 'master' into patch-content-manager
2018-05-31 13:53:07 +02:00
Jim LAURIE
6d3d03df8d
Merge pull request #1287 from johannpinson/patch-graphql-required
...
Add `!` flag for GraphQL and non-nullable field
2018-05-31 13:52:33 +02:00
Jim LAURIE
aeff4d663c
Merge branch 'master' into patch-graphql-required
2018-05-31 12:22:18 +02:00
Jim Laurie
5d8a24a010
Fix add multi column for mysql fix #1241
2018-05-31 12:03:24 +02:00
Jim Laurie
d2fd1204e4
Convert 1/0 to true/false for mysql fix #1203
2018-05-30 15:13:04 +02:00
Jim Laurie
480f69c36f
Fix cors on option request fix #914
2018-05-30 14:06:19 +02:00
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
Jim Laurie
fbfdbf4812
Add oneToOne tests
2018-05-29 18:22:02 +02:00
Jim Laurie
50c30c79f4
Add oneToMany test and describe data independence
2018-05-29 16:30:29 +02:00
Johann Pinson
de691ca47f
Fix toJSON verification
2018-05-29 15:08:43 +02:00
Okaris
89c97e6cae
Added count to api template
2018-05-29 16:07:17 +03:00
Johann Pinson
fc85f8b47e
Merge branch 'master' into patch-content-manager
2018-05-29 12:01:37 +02:00
