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

1323 Commits

Author SHA1 Message Date
Moritz Eck
c7c14dccf0
Merge branch 'master' into feature/german-translations-update 2020-11-16 16:54:38 +01:00
Alexandre Bodin
5fe7fa2f79 v3.3.3 2020-11-16 16:47:16 +01:00
Jean-Sébastien Herbaux
4a33829f11
Sanitize /upload/search/:q route (#8658) 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-11-16 12:55:35 +01:00
Moritz Eck
b368bb41ed add & improve german translations 
Signed-off-by: Moritz Eck <moritz.eck@gmail.com>
 2020-11-11 19:21:55 +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
cyril lopez
fd3e54b821
Merge branch 'master' into features/application-settings 2020-11-02 16:14:44 +01:00
Eneko Rodríguez
3cba913a2f feat: improve spanish translations 
Signed-off-by: Eneko Rodríguez <eneko.rodriguez99@gmail.com>
 2020-10-31 20:19:41 +01:00
soupette
30cb4f4226 Merge branch 'master' of github.com:strapi/strapi into features/application-settings 2020-10-27 17:28:39 +01:00
Alexandre Bodin
c78591553f v3.2.5 2020-10-22 17:40:58 +02:00
Alexandre BODIN
328c1a3a13
Merge pull request #8442 from strapi/security/upload-proxy-disable 
Remove usage of unsecure proxy for now
 2020-10-22 17:37:28 +02:00
Alexandre Bodin
fbf831355d Remove usage of unsecure proxy for now 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-22 17:07:38 +02:00
Derrick Mehaffy
0b4a8109e2 Fix #8413 - Immer dependancy 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-10-21 07:03:46 -07:00
soupette
3de1a1fe98 Merge branch 'master' of github.com:strapi/strapi into features/application-settings 2020-10-21 14:56:00 +02:00
Alexandre Bodin
e8153d99c0 v3.2.4 2020-10-16 18:22:15 +02:00
dependabot[bot]
4b9476f3bc
Bump sharp from 0.26.0 to 0.26.2 (#8348) 
Bumps [sharp](https://github.com/lovell/sharp) from 0.26.0 to 0.26.2.
- [Release notes](https://github.com/lovell/sharp/releases)
- [Changelog](https://github.com/lovell/sharp/blob/master/docs/changelog.md)
- [Commits](https://github.com/lovell/sharp/compare/v0.26.0...v0.26.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-10-16 09:44:30 +02:00
soupette
10a39592f9 Merge branch 'master' of github.com:strapi/strapi into features/application-settings 2020-10-15 15:02:29 +02:00
HichamELBSI
46cb089496 Merge branch 'features/application-settings' into core/new-notif-api 2020-10-14 14:40:00 +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
hhh
ed71cc2d8a
Fix file info of new uploaded file not being persisted after edit (#8244) 
* Fix file info of new uploaded file not being persisted after edit

Signed-off-by: henrych4 <singyinhenry@gmail.com>

* Fix typo and add test

Signed-off-by: henrych4 <singyinhenry@gmail.com>

Co-authored-by: cyril lopez <cyril.lpz@gmail.com>
 2020-10-14 13:04:08 +02:00
Jean-Sébastien Herbaux
9871562359
Fix wrong permissions assigns (upload, users-permissions) (#8320) 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-13 18:51:09 +02:00
Bochkarev Ivan
0abd23eaab
Added new translations into Russian (#8312) 
Signed-off-by: Bochkarev Ivan <ivanx86@gmail.com>
 2020-10-13 15:14:58 +02:00
HichamELBSI
634a555ada Clean code 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-10-12 11:50:01 +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
38126d9a32
Fix "has same role as author" condition not working properly (#8202) 
* Fix "has same role as author" condition not working properly

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

* Use creators constants

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

* Add e2e test for default conditions, fix conditions on mongoose

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

* Fix tests in CE

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-08 19:50:39 +02:00
HichamELBSI
a804b8c087 New notification API + Update notif 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-10-08 17:22:38 +02:00
henrych4
0593ca14d8 Fix incorrect notification when copy media url to clipboard 
Signed-off-by: henrych4 <singyinhenry@gmail.com>
 2020-10-07 23:59:28 +08:00
Alexandre Bodin
5a77b560e3 v3.2.1 2020-10-07 14:50:47 +02:00
Dan Wendorf
bf8c17f120
Bump node-fetch to 2.6.1 (#8191) 
node-fetch < 2.6.1 has a security vulnerability
(https://github.com/advisories/GHSA-w7rc-rwvf-8q5r)

This is a major version bump for strapi-plugin-upload (from 1.7.3), but
it does not look like strapi-plugin-upload is relying on any of the
functionality that has broken from 1.x to 2.x

Signed-off-by: Dan Wendorf <dan@render.com>
 2020-10-06 17:20:57 +02:00
Alexandre Bodin
95f3502ab4 v3.2.0 2020-10-06 11:01:02 +02:00
Alexandre Bodin
c98089ff65 Merge branch 'master' into releases/3.2 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-05 12:00:03 +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
Max Veerapat Kumchom
915743af37
add strapi-plugin-upload thai translation (#8142) 
* init thai template

Signed-off-by: themaxaboy <themaxaboy@hotmail.com>

* translate strapi-plugin-upload

Signed-off-by: themaxaboy <themaxaboy@hotmail.com>
 2020-10-02 17:38:53 +02:00
Alexandre Bodin
66e8579fc7 Merge branch 'master' into features/templates-cli 2020-10-02 15:21:16 +02:00
Convly
564f9228ca v3.1.7 2020-10-02 11:48:42 +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
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
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
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
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
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
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
Pierre Noël
cd9abb4961 fix cropped size too big 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-09-25 17:03:07 +02:00
Alexandre Bodin
3c7c33eab7 v3.1.6 2020-09-24 14:51:49 +02:00
Alexandre BODIN
c97f33bf53
Merge pull request #7716 from strapi/fix/7699 
Fixes Admin bugs
 2020-09-24 14:41:10 +02:00
soupette
fa762abee7 Bump buffet.js to stable version 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-24 08:36:26 +02:00
soupette
6020c8e7e5 Upgrade buffet.js rc.5 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-09-23 17:20:24 +02:00