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

15371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre BODIN
b419aedd92
Merge pull request #8158 from strapi/fix-install-uninstall-plugins-routes-visibility 
Fix (un)install plugins routes visibility
 2020-10-02 16:45:10 +02:00
Convly
5f316252f9 Fix (un)install plugins routes visibility 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-02 16:43:39 +02:00
Thew Dhanat
620f84a962
Update configurations.md (#8150) 
Signed-off-by: ThewBear <26767607+ThewBear@users.noreply.github.com>
 2020-10-02 06:42:51 -07:00
dependabot[bot]
51b23d165e
Bump mongoose-long from 0.2.1 to 0.3.2 (#8147) 
Bumps [mongoose-long](https://github.com/aheckmann/mongoose-long) from 0.2.1 to 0.3.2.
- [Release notes](https://github.com/aheckmann/mongoose-long/releases)
- [Changelog](https://github.com/mongoosejs/mongoose-long/blob/master/History.md)
- [Commits](https://github.com/aheckmann/mongoose-long/compare/0.2.1...0.3.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-10-02 15:25:06 +02:00
Alexandre Bodin
66e8579fc7 Merge branch 'master' into features/templates-cli 2020-10-02 15:21:16 +02:00
Alexandre Bodin
035ae1045f Use os tmp dir and simplify some code 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-02 15:20:50 +02:00
Tanmoy Bhowmik
012902d94f
Feat: Add private option field for relations (#8149) 
* feat(content-type): add private option to relation field

Signed-off-by: tanmoyopenroot <tanmoy.openroot@gmail.com>

* test(content-type): add test for private option in relation field

Signed-off-by: tanmoyopenroot <tanmoy.openroot@gmail.com>
 2020-10-02 15:20:37 +02:00
Rémi de Juvigny
e64ac06af8 Better error handling 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-10-02 12:40:31 +02:00
Convly
4844ba9ebe Merge branch 'master' into documentation 2020-10-02 11:57:51 +02:00
Convly
564f9228ca v3.1.7 v3.1.7 2020-10-02 11:48:42 +02:00
cyril lopez
c55236c48e
Merge branch 'master' into front/events 2020-10-02 10:53:20 +02:00
Alexandre Bodin
0e064d10e8 Merge branch 'master' into features/templates-cli 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-02 10:20:10 +02:00
HichamELBSI
9667f0fc3b Bump BuffetJS to 3.3.1 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-10-02 09:54:18 +02:00
dependabot[bot]
048e6fd3af
Bump mongoose from 5.8.0 to 5.10.7 (#8046) 
* Bump mongoose from 5.8.0 to 5.10.7

Bumps [mongoose](https://github.com/Automattic/mongoose) from 5.8.0 to 5.10.7.
- [Release notes](https://github.com/Automattic/mongoose/releases)
- [Changelog](https://github.com/Automattic/mongoose/blob/master/History.md)
- [Commits](https://github.com/Automattic/mongoose/compare/5.8.0...5.10.7)

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

* Do not use empty username or password in mongo connection

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-02 09:27:46 +02:00
soupette
3ce9f61058 Update snapshots 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-10-02 08:39:59 +02:00
cyril lopez
1e965d1d1d
Merge branch 'master' into front/events 2020-10-02 08:37:05 +02:00
Alexandre BODIN
dbfde36360
Merge pull request #8132 from strapi/fix-upload-provider-jest-cache 
Prevent .cache folders to impact the unit tests
 2020-10-01 18:29:29 +02:00
cyril lopez
74464c9d14
Merge pull request #8131 from strapi/fix/author-role-publish-permissions 
Fix author role for the publish permission action
 2020-10-01 18:23:01 +02:00
soupette
88eaca89a9 Add events regarding the D&P feature 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-10-01 18:17:59 +02:00
Convly
0c950a9d2f Prevent .cache folders to impact the unit tests 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-01 17:49:51 +02:00
Dave Judd
ac06194953
Fix grammar (#8126) 
Change "...you can access to every..." to "...you can access every...:"
 2020-10-01 08:47:29 -07: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
HichamELBSI
1fc43588e4 Fix author role for the publish permission action 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-10-01 17:43:06 +02:00
Alexandre Bodin
4d5177898b Fix jest hast map issue with .cache folder in examples 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-01 17:37:05 +02:00
Alexandre Bodin
9f00438471 Fix count queries 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-01 17:18:58 +02:00
Alexandre Bodin
e44a3f212e Fix missing strapi global in entity service tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-01 17:17:05 +02:00
Alexandre Bodin
8589848ce4 Merge branch 'features/draft-publish' into releases/3.2 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-01 16:23:32 +02:00
Michael Gwynne
7a45bde796
Add noindex to public index page (#7917) 
* Add noindex to public index page

Signed-off-by: Michael Gwynne <michael.gwynne@checkatrade.com>

* Acting on PR comments

Signed-off-by: Michael Gwynne <michael.gwynne@checkatrade.com>
 2020-10-01 13:46:01 +02:00
dependabot[bot]
4ad37956d7
Bump sqlite3 from 4.2.0 to 5.0.0 (#8122) 
Bumps [sqlite3](https://github.com/mapbox/node-sqlite3) from 4.2.0 to 5.0.0.
- [Release notes](https://github.com/mapbox/node-sqlite3/releases)
- [Changelog](https://github.com/mapbox/node-sqlite3/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mapbox/node-sqlite3/compare/v4.2.0...v5.0.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-10-01 13:22:56 +02:00
dependabot[bot]
be7dfaabd3
Bump is-valid-domain from 0.0.14 to 0.0.15 (#8120) 
Bumps [is-valid-domain](https://github.com/miguelmota/is-valid-domain) from 0.0.14 to 0.0.15.
- [Release notes](https://github.com/miguelmota/is-valid-domain/releases)
- [Commits](https://github.com/miguelmota/is-valid-domain/commits)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-10-01 09:46:35 +02:00
Alexandre BODIN
68e61f7e54
Merge branch 'master' into features/templates-cli 2020-09-30 15:49:23 +02:00
soupette
2432fe4a00 Fix lint 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-30 15:48:03 +02:00
soupette
3f47885c5a Merge branch 'master' of github.com:strapi/strapi into front/events 2020-09-30 15:47:37 +02:00
Maxime Castres
34f143827c
Docs/integrations (#7792) 
* 5 new integrations

* More integrations

Signed-off-by: Maxime Castres <mcastres@student.42.fr>

* AUpdate Nuxt.js --amend --signoff

* Add 11ty

Signed-off-by: Maxime Castres <mcastres@student.42.fr>

* Correction after soupette's review

* Correct python file

* Alex review

* Alex review 2: replace console.error to log
 2020-09-30 14:52:14 +02:00
Alexandre Bodin
a22baf9a0d Fix peer deps 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-09-30 12:46:05 +02:00
Rémi de Juvigny
5726c36edf Fix yarn lock conflict 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-09-30 11:19:20 +02:00
cyril lopez
6b6f1c2138
Merge branch 'master' into front/events 2020-09-30 11:12:33 +02:00
dependabot[bot]
e6d14482c4
Bump stylelint-processor-styled-components from 1.6.0 to 1.10.0 (#8002) 
Bumps [stylelint-processor-styled-components](https://github.com/styled-components/stylelint-processor-styled-components) from 1.6.0 to 1.10.0.
- [Release notes](https://github.com/styled-components/stylelint-processor-styled-components/releases)
- [Changelog](https://github.com/styled-components/stylelint-processor-styled-components/blob/master/CHANGELOG.md)
- [Commits](https://github.com/styled-components/stylelint-processor-styled-components/compare/v1.6.0...v1.10.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-30 10:37:34 +02:00
dependabot[bot]
adb7e5c9f6
Bump eslint-plugin-react-hooks from 2.5.1 to 4.1.2 (#8103) 
Bumps [eslint-plugin-react-hooks](https://github.com/facebook/react/tree/HEAD/packages/eslint-plugin-react-hooks) from 2.5.1 to 4.1.2.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/packages/eslint-plugin-react-hooks/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/HEAD/packages/eslint-plugin-react-hooks)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-30 10:17:11 +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
Mattias van den Belt
c5275958b0
Per hook timeout config option (#8081) 
* Add per hook timeout config

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update hook docs with timeout config options

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>
 2020-09-29 16:07:10 +02:00
Alexandre BODIN
2741cfc372
Merge pull request #7942 from Igi4/patch-1 
Fix incorrect PostgreSQL data path in example doc
 2020-09-29 15:00:42 +02:00
Igor Nikolenko
4700f79bcf
Fix validation of Date and Time field types for Mongoose connector (#7801) 
Signed-off-by: richardgrey <richie.grey@gmail.com>
 2020-09-29 14:53:56 +02:00
Jonas De Kegel
42fab5d953
Assume selection is text when creating a link (#8071) 
Fixes #7890

Signed-off-by: Jonas De Kegel <jonas@fluid.desi>
 2020-09-29 14:13:11 +02:00
erictsangx
1e4c3b7237
Allow browser options while using watch-admin (#8054) 
Signed-off-by: erictsangx <erictsangx@gmail.com>
 2020-09-29 14:12:38 +02:00
Rami Yushuvaev
b5ce86a805
Add translations to Hebrew language (#7871) 
* Translate Strapi admin to Hebrew language

Signed-off-by: Rami Yushuvaev <r_a_m_i@hotmail.com>

* Translate Strapi plugin upload to Hebrew language

Signed-off-by: Rami Yushuvaev <r_a_m_i@hotmail.com>
 2020-09-29 14:09:26 +02:00
Filip Sauer
c1ae95c3bf
Update strapi-admin polish translation (#7507) 
Signed-off-by: Filip Sauer <sauer.filip@gmail.com>
 2020-09-29 14:08:38 +02:00
Pierre Noël
567401f0c1
Fix/warn file too big (#8033) 
* handle fileTooBig errors

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* add entityTooLarge error in provider plugins

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* fix linter

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* refacto

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* Add better error message for 413 errors in ML

Signed-off-by: soupette <cyril.lpz@gmail.com>

* refacto

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* refacto

Signed-off-by: Pierre Noël <petersg83@gmail.com>

Co-authored-by: soupette <cyril.lpz@gmail.com>
 2020-09-29 12:00:25 +02:00
soupette
c66ddc2415 Add events 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-29 10:56:45 +02:00
Jim LAURIE
451d551f27
Merge pull request #7720 from danilopolani/patch-1 
Fix documentation about unit testing
 2020-09-28 17:09:14 +02:00