yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-06 07:50:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,246 Commits 112 Branches 487 Tags
Commit Graph

650 Commits

Author SHA1 Message Date
Alexandre Bodin
fd18d2a67a Merge branch 'master' into features/i18n 2021-04-02 17:33:24 +02:00
dependabot[bot]
ee59d4fbc7
Bump apollo-server-koa from 2.19.1 to 2.22.1 (#9855) 
Bumps [apollo-server-koa](https://github.com/apollographql/apollo-server/tree/HEAD/packages/apollo-server-koa) from 2.19.1 to 2.22.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.22.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>
 2021-03-29 12:49:23 +02:00
Convly
4c21bea64b Use a global timeout instead of redefining it everytime 2021-03-26 20:15:38 +01:00
Alexandre Bodin
a66e0269da Merge branch 'master' into features/i18n 2021-03-25 15:07:41 +01:00
Alexandre Bodin
3065d72a4b v3.5.4 2021-03-25 14:34:45 +01:00
Alexandre Bodin
c57b3be1eb Merge branch 'master' into features/i18n 2021-03-12 09:45:51 +01:00
Alexandre Bodin
33552e43b8 v3.5.3 2021-03-11 14:25:37 +01:00
Alexandre BODIN
b3635962a3
Fix component assoc resolvers in graphql (#9660) 2021-03-10 10:46:46 +01:00
DMehaffy
ba0637e26b
Update all documentation links in the code-base and readmes (#9643) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2021-03-09 09:13:15 +01:00
Alexandre Bodin
e9b4bf5616 Merge branch 'master' into features/i18n 2021-03-05 12:22:18 +01:00
Alexandre BODIN
65bc2d04d3
Fix config renamed by error (#9559) 2021-03-01 19:12:54 +01:00
Alexandre Bodin
1a472c98a7 v3.5.2 2021-03-01 11:24:44 +01:00
Convly
3cc49c4ea8 v3.5.1 2021-02-23 11:23:21 +01:00
Alexandre Bodin
469991f9f2 Merge branch 'master' into features/i18n 2021-02-18 14:36:32 +01:00
Alexandre Bodin
d02a7ba2fa v3.5.0 2021-02-18 11:28:28 +01:00
Pierre Noël
b3a9b5ad76 add pluginOptions 2021-02-10 14:29:54 +01:00
dependabot[bot]
de552b6dd5
Bump koa from 2.13.0 to 2.13.1 (#9311) 
Bumps [koa](https://github.com/koajs/koa) from 2.13.0 to 2.13.1.
- [Release notes](https://github.com/koajs/koa/releases)
- [Changelog](https://github.com/koajs/koa/blob/master/History.md)
- [Commits](https://github.com/koajs/koa/compare/2.13.0...2.13.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-08 09:38:42 +01:00
Alexandre Bodin
544f98b8ee v3.4.6 2021-02-03 19:32:36 +01:00
Alexandre BODIN
42d1d2b38e
test fix for many many perf issues (#9286) 2021-02-03 19:29:30 +01:00
dependabot[bot]
1d44c63f1b
Bump graphql from 15.4.0 to 15.5.0 (#9276) 
Bumps [graphql](https://github.com/graphql/graphql-js) from 15.4.0 to 15.5.0.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v15.4.0...v15.5.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-01 09:37:52 +01:00
Pierre Noël
b0bf427ac4 Merge branch 'master' into features/i18n 2021-01-29 10:11:52 +01:00
Jorrit Schippers
175422d760
Update .npmignore files (#8865) 
Add .editorconfig, .snyk, __tests__, jest.config.js
Remove .npmignore and .gitignore from admin subdirectories

Signed-off-by: Jorrit Schippers <jorrit@ncode.nl>
 2021-01-28 16:57:29 +01:00
Alexandre Bodin
5524d72396 Merge branch 'master' into features/i18n 2021-01-28 11:35:17 +01:00
Alexandre Bodin
4f9cc8a22c v3.4.5 2021-01-26 11:59:47 +01:00
pimsomeday
5d5ed0890b
Fix/8754 disable graphql queries other than crud (#9131) 
* removes disabled resolvers from definitions

* cleanup

* fix empty query or mutation in schema

* filters disabled resolvers using graphql-tools

* returns generated schema directly

* return complete schema

* use lodash to get resolver

* uses printSchema from graphql
 2021-01-22 19:06:04 +01:00
Pierre Noël
3729f69e08 init i18n plugin 2021-01-22 17:57:15 +01:00
Alexandre Bodin
542786f263 v3.4.4 2021-01-20 17:31:59 +01:00
Alexandre Bodin
553d64cafd v3.4.3 2021-01-14 10:46:50 +01:00
dependabot[bot]
2a79cd57c5
Bump apollo-server-koa from 2.18.2 to 2.19.1 (#9123) 
Bumps [apollo-server-koa](https://github.com/apollographql/apollo-server/tree/HEAD/packages/apollo-server-koa) from 2.18.2 to 2.19.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.19.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>
 2021-01-14 10:00:35 +01:00
Alexandre Bodin
7505de6ad9 v3.4.2 2021-01-13 12:16:44 +01:00
Convly
2a483ba958 Cleanup 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-08 10:09:08 +01:00
Convly
44b213dc6d Fix memory leak (causing heap overflow) 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-08 10:09:06 +01:00
Convly
857a78e252 Add all missing e2e tests (draft) 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-08 09:52:22 +01:00
Alexandre BODIN
63a34cf3c5
Merge branch 'master' into fix/graphql-rels 2021-01-05 13:58:44 +01:00
dependabot[bot]
3610f8c6c1
Bump graphql-playground-middleware-koa from 1.6.20 to 1.6.21 (#9041) 
Bumps [graphql-playground-middleware-koa](https://github.com/graphcool/graphql-playground) from 1.6.20 to 1.6.21.
- [Release notes](https://github.com/graphcool/graphql-playground/releases)
- [Commits](https://github.com/graphcool/graphql-playground/compare/graphql-playground-middleware-koa@1.6.20...graphql-playground-middleware-koa@1.6.21)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-05 10:08:04 +01:00
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