yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-06 15:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,807 Commits 112 Branches 488 Tags
Commit Graph

590 Commits

Author SHA1 Message Date
Alexandre Bodin
e8153d99c0 v3.2.4 2020-10-16 18:22:15 +02:00
Alexandre BODIN
e53b54c218
Support query operators _or & _where in graphql with deep nesting (#8332) 
* SUpport query operators _or _where in graphql with deep nesting

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

* Add testing for complexe graphql queries

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-15 13:22:40 +02:00
Alexandre Bodin
71a2657ed8 test node v14 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 13:14:14 +02:00
Alexandre Bodin
7485de2fdf v3.2.3 2020-10-09 17:12:50 +02:00
Convly
b3d0b72198 v3.2.2 2020-10-09 11:52:09 +02:00
Jean-Sébastien Herbaux
b2b4515d9b
Fix D&P population (#8249) 
* Fix D&P population (gql, rest)

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix units tests

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix mongoose filtering on non draft & publish model

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-08 20:54:48 +02:00
Alexandre Bodin
5a77b560e3 v3.2.1 2020-10-07 14:50:47 +02:00
Alexandre Bodin
95f3502ab4 v3.2.0 2020-10-06 11:01:02 +02:00
Alexandre Bodin
fcb2878987 Use a symbol to pass options add make it work with many before fixing them 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-06 10:08:31 +02:00
Alexandre Bodin
60b52cf946 Add publicationState only if received in the args 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-06 10:08:31 +02:00
Alexandre Bodin
5f7fcafc5f Fix publciationState for nested populations 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-06 10:08:30 +02:00
Convly
773a86ae58 Fix conflicts / params => queryArguments 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-05 16:02:44 +02:00
Convly
0951e45d12 Add publicationState argument for graphql queries 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-05 15:56:30 +02:00
François de Metz
645c0b8cf4
Implement deleteFile graphql mutation (#5292). (#7937) 
* Implement deleteFile graphql mutation (#5292).

Signed-off-by: François de Metz <francois@2metz.fr>

* Test if the file exist before removing it.

Signed-off-by: François de Metz <francois@2metz.fr>

* Fix a typo.

Signed-off-by: François de Metz <francois@2metz.fr>
 2020-10-05 11:34:15 +02:00
Convly
564f9228ca v3.1.7 2020-10-02 11:48:42 +02:00
Jean-Sébastien Herbaux
e55ea1d6b5
Hide creator fields from public api by default (#8052) 
* Add model option to hide/show creators fields in public API response

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Add content-types util, rework sanitize-entity's private handling

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Update search e2e tests, fix an issue on empty search for the core-api controller (find)

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix GraphQL plugin (handle privates attributes on typeDefs + resolver builds)

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix sanitizeEntity import

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Move doc update from beta to stable

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix e2e test

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix pr comments

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove creator's field from upload controller routes

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix typedef build for graphql association

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix pr (comments + several issues)

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Add tests for search behavior in content-manager

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Rename files variables to meaningful names (upload controllers)

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix test with search id matching serialNumber

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

* Add toHasBeenCalledWith check for config.get (utils/content-types.test.js)

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-01 17:47:08 +02:00
dependabot[bot]
cc568a3929
Bump apollo-server-koa from 2.17.0 to 2.18.1 (#8104) 
Bumps [apollo-server-koa](https://github.com/apollographql/apollo-server/tree/HEAD/packages/apollo-server-koa) from 2.17.0 to 2.18.1.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/commits/apollo-server-koa@2.18.1/packages/apollo-server-koa)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-30 09:24:50 +02:00
Alexandre Bodin
3c7c33eab7 v3.1.6 2020-09-24 14:51:49 +02:00
Diego Albitres
0670c896e3
Add privateAttributes to global and per model response (#7331) 
* Added privateAttributes globally and per model

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Added tests for sanitizeEntity

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Fixed broken test

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Added privateAttributes to GraphQL responses

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Added docs for privateAttributes

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Refactored and fixed PR comments

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Merged tests and fixed broken tests from merge

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Updated documentation for new option

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Refactored GraphQL implementation

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Fixed PR comments

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Fixed tests for sanitize-entity

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Removed code and tests for ignorePrivateFor

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Exported getPrivateAttributes for GraphQL plugin

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Removed ignorePrivateFor from docs

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>
 2020-09-24 09:40:10 +02:00
Daniel dos Santos Pereira
f5f0853942
fix(plugin-graphql): Fix associaion resolver for manyWay nature. (#7959) 
This fixes strapi/strapi#4353 and all its duplicates.

Signed-off-by: Daniel dos Santos Pereira <danield1591998@gmail.com>
 2020-09-22 17:05:27 +02:00
Abdón Rodríguez Davila
79a996f871
Update graphql plugin dependencies (#7953) 
Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>
 2020-09-22 17:00:40 +02:00
Peter Etelej
318f20e826
Bump up minimum required Node to 10.16 (#7962) 
Updated README docs & package.json `engine` versions to bump up the
minimum required Node version from `10.10` to `10.16` (or `10.16.0+`)

Strapi no longer supports `10.10` since it updated `sharp` to `0.26.0`
( https://github.com/strapi/strapi/pull/7729 ) which requires Node 10.16.0+
(See https://github.com/lovell/sharp/blob/master/docs/changelog.md#v0260---25th-august-2020 )

` yarn create strapi-app my-project --quickstart` on 10.10 fails with error
```
error sharp@0.26.0: The engine "node" is incompatible with this module. Expected version ">=10.16.0". Got "10.10.0"
error Found incompatible module.
```

Signed-off-by: Peter Etelej <peter@etelej.com>
 2020-09-22 16:00:13 +02:00
Convly
736a580001 v3.1.5 2020-09-16 15:26:12 +02:00
Abdón Rodríguez Davila
d2ef1d4b8c
Allow more options to the Apollo Server config (#7665) 
* Extract server config to a constant

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Omit options to server config

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Move default config to serverParams

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Simplify Apollo server config

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Simplify with a new apolloServerConfig property

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Update tracing documentation

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Extract deprecated options

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Add default options

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Update documentation

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Rename to deprecatedApolloServerConfig

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Empty default options

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Update default config

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Add warning note

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Add documentation note

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Update documentation note

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Fix the config check

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Fix the config check

Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>

* Refactor old code and rename param to appoloServer to avoid redondancy

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

* Fix typo

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-09-04 09:51:11 +02:00
Alexandre Bodin
6905be68bc Merge branch 'documentation' 2020-09-02 17:23:41 +02:00
DMehaffy
024b337b09
Update node version requirements for v10 to v12 (#7409) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-09-02 17:11:59 +02:00
dependabot[bot]
71a3ba3378
Bump graphql-playground-middleware-koa from 1.6.12 to 1.6.19 
Bumps [graphql-playground-middleware-koa](https://github.com/graphcool/graphql-playground) from 1.6.12 to 1.6.19.
- [Release notes](https://github.com/graphcool/graphql-playground/releases)
- [Commits](https://github.com/graphcool/graphql-playground/commits/graphql-playground-middleware-koa@1.6.19)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-02 06:00:38 +00:00
soupette
fb6010369a Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-26 10:38:54 +02:00
DMehaffy
bdf3b03c7e
Merge branch 'master' into master 2020-08-15 10:32:53 -07:00
ScottAgirs
a930d6e814 Grammar fix 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-08-13 21:30:28 -04:00
Pierre Noël
fb2db4b050 v3.1.4 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-13 19:05:20 +02:00
Pierre Noël
231263a353 v3.1.4 2020-08-13 18:58:14 +02:00
ScottAgirs
386984f085 improve wording 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-08-10 15:35:15 -04:00
ScottAgirs
e06f3647ff [update] package description 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-08-08 15:24:30 -04:00
ScottAgirs
c3efac898d [update README] 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-08-08 15:24:09 -04:00
Daan van Ham
0f34541231
Merge branch 'master' into master 2020-08-07 16:16:09 +02:00
Adam
c8dc074d3b
fix(graphql): filter out orphaned relationships (#7363) 
Signed-off-by: Adam Lee <admosity@users.noreply.github.com>
 2020-08-07 15:55:53 +02:00
Daan van Ham
e933c28012 fixed strapi/strapi#7334 add the data-loader for admin users to the graphql-plugin 
Signed-off-by: Daan van Ham <daan.van.ham@frontmen.nl>
 2020-08-07 15:50:16 +02:00
Alexandre Bodin
97922f99ae v3.1.3 2020-07-31 09:59:56 +02:00
Alexandre Bodin
6aaa018ff5 v3.1.2 2020-07-29 13:34:01 +02:00
Kim, Harim
b670db3c57
add engine config to apollo server params (#7244) 
Signed-off-by: harimkims <harimkims@gmail.com>
 2020-07-29 13:01:32 +02:00
dependabot[bot]
aea96bca68
Bump lodash from 4.17.15 to 4.17.19 (#7239) 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-29 11:10:32 +02:00
dependabot[bot]
33634151d4
Bump pluralize from 7.0.0 to 8.0.0 (#7126) 
Bumps [pluralize](https://github.com/blakeembrey/pluralize) from 7.0.0 to 8.0.0.
- [Release notes](https://github.com/blakeembrey/pluralize/releases)
- [Commits](https://github.com/blakeembrey/pluralize/compare/v7.0.0...v8.0.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-07-25 08:53:05 +02:00
Alexandre Bodin
35bae7df57 v3.1.1 2020-07-23 18:53:55 +02:00
Will Eldrid-Otterburn
22319dc6d0
Upgrade apollo-server-koa (#7087) 
* Upgrade apollo-server-koa

Signed-off-by: Will Eldrid-Otterburn <will.eldrid-otterburn@red-badger.com>

* Set apollo-server-koa to strict version

Signed-off-by: Will Eldrid-Otterburn <will.eldrid-otterburn@red-badger.com>

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-07-22 14:07:08 +02:00
Alexandre Bodin
1bbf1bc0dc v3.1.0 2020-07-21 19:30:45 +02:00
Alexandre Bodin
62b2192c95 Update license info 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-20 18:40:52 +02:00
Alexandre Bodin
6bafa35a36 Merge branch 'releases/3.1.0' into features/rbac 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-18 10:12:40 +02:00
Alexandre Bodin
4d31935716 v3.0.6 2020-07-16 17:03:04 +02:00
Alexandre Bodin
b71ffa6c6c Merge branch 'master' into features/rbac 2020-07-16 14:52:55 +02:00