yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 08:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,425 Commits 127 Branches 497 Tags
Commit Graph

665 Commits

Author SHA1 Message Date
Alexandre Bodin
b08bc9ef48 Removed unused code & fix some typo 2021-01-05 09:38:12 +01:00
Alexandre Bodin
2a6e1e0b84 Add tests to data-loaders 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2021-01-04 15:55:07 +01:00
soupette
8b9c3f2052 v3.4.1 2020-12-22 16:52:46 +01:00
DMehaffy
aad1c2fa03
Cleaning up codebase for doc repo move (#8892) 
* [WIP] Cleaning up codebase for doc repo move

WIP

* Fix deleted files, add links to doc repo issues

* Add repo note to readme
 2020-12-18 15:50:37 +01:00
Christopher Wray
99d39f5d4c
cwray-tech/update plugin descriptions (#8921) 
* Changed plugin description-more helpful text

The marketplace area in the cms shows this text, so I thought this would be a little more helpful than the default text.

Signed-off-by: Christopher Wray <53663762+cwray-tech@users.noreply.github.com>

* updated Graphql description text

* Update email description

* update upload description
 2020-12-18 09:53:46 +01:00
Alexandre Bodin
ea636b4d31 v3.4.0 2020-12-17 13:18:50 +01:00
Alexandre Bodin
df3a40c84b Merge branch 'master' into feature/relational-fields 2020-12-16 16:39:58 +01:00
dependabot[bot]
e6e228314e
Bump graphql from 15.3.0 to 15.4.0 (#8903) 
Bumps [graphql](https://github.com/graphql/graphql-js) from 15.3.0 to 15.4.0.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v15.3.0...v15.4.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-16 11:18:47 +01:00
HichamELBSI
53231b5833 Merge branch 'master' into feature/relational-fields 2020-12-16 10:17:47 +01:00
dependabot[bot]
44eaeb74c5
Bump @apollo/federation from 0.20.2 to 0.20.7 (#8895) 
Bumps [@apollo/federation](https://github.com/apollographql/federation/tree/HEAD/federation-js) from 0.20.2 to 0.20.7.
- [Release notes](https://github.com/apollographql/federation/releases)
- [Changelog](https://github.com/apollographql/federation/blob/main/federation-js/CHANGELOG.md)
- [Commits](https://github.com/apollographql/federation/commits/@apollo/federation@0.20.7/federation-js)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-15 10:26:42 +01:00
Diogo Correia
7585658128
Add ability to disable aggregation on GraphQL (#8119) 
Signed-off-by: Diogo Correia <me@diogotc.com>
 2020-12-14 11:57:13 +01:00
dependabot[bot]
5ea4d54204
Bump cross-env from 5.2.1 to 7.0.3 (#8856) 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 5.2.1 to 7.0.3.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v5.2.1...v7.0.3)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-10 11:12:57 +01:00
Alexandre Bodin
c9c936ba41 Merge branch 'master' into feature/relational-fields 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-25 16:37:32 +01:00
Alexandre Bodin
9b28991d8a v3.3.4 2020-11-25 16:22:45 +01:00
soupette
61a3740c06 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-23 14:43:07 +01:00
Alexandre Bodin
5fe7fa2f79 v3.3.3 2020-11-16 16:47:16 +01:00
Alexandre Bodin
17ea510715 v3.3.2 2020-11-10 19:02:11 +01:00
Alexandre Bodin
98bb6a3d31 v3.3.1 2020-11-09 19:22:52 +01:00
Pierre Noël
ec1c2a22c3 v3.3.0 2020-11-09 17:55:10 +01:00
iraj taghlidi
fba8959797
Upgrade graphql-tools package to use GraphQL v15 (#8461) 
Signed-off-by: iraj <irajtaghlidi@gmail.com>
 2020-11-07 11:56:42 +01:00
Alexandre Bodin
08a603623b Cleanup tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-02 19:41:46 +01:00
Alexandre Bodin
0db015e6c2 Update tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-02 19:41:45 +01:00
Alexandre Bodin
bfa6766475 init coll-type 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-02 19:41:45 +01:00
Alexandre Bodin
07e7cfc0bd Make lint stricter and fix the errors 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-02 19:41:42 +01:00
Alexandre Bodin
c78591553f v3.2.5 2020-10-22 17:40:58 +02:00
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