yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-26 06:35:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,146 Commits 138 Branches 514 Tags
Commit Graph

20146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pierre Noël
8ccd3406b6 detect valid JSON string to not parse twice 2022-02-15 15:03:47 +01:00
Pierre Noël
8c2251bb79 stop parsing JSON 2022-02-15 15:03:47 +01:00
Alexandre BODIN
1f5728f9b7
Merge pull request #12532 from konstantinmuenster/patch-1 
Update sharp in upload plugin
 2022-02-15 13:45:25 +01:00
Alexandre BODIN
5e4c1eb274
Merge pull request #12519 from strapi/fix-cm-injection-zone 
Put CM links injection zone on top of the other links
 2022-02-15 13:44:51 +01:00
Gustav Hansen
55f07ec804
Merge pull request #12428 from strapi/content-92/remove-assets-upload 
UploadDialog: allow removing assets before uploading
 2022-02-15 13:37:36 +01:00
soupette
bbbb981dbb Fix snapshots 
Signed-off-by: soupette <cyril@strapi.io>
 2022-02-15 12:42:09 +01:00
Gustav Hansen
48e60db5c3 chore: Remove bad merge leftover 2022-02-15 12:29:52 +01:00
Gustav Hansen
bece301d57
Merge pull request #12266 from iicdii/feature/enable-to-drop-image 
Enable to drop image to upload dialog in edit view
 2022-02-15 12:26:24 +01:00
soupette
9fc8cac51c Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2022-02-15 11:52:26 +01:00
Alexandre BODIN
ce239eedb6
Merge pull request #12529 from strapi/dependabot/npm_and_yarn/jest-cli-26.6.3 
Bump jest-cli from 26.0.1 to 26.6.3
 2022-02-15 11:21:30 +01:00
Alexandre BODIN
ad8954cc69
Merge pull request #12530 from strapi/dependabot/npm_and_yarn/msw-0.36.8 
Bump msw from 0.35.0 to 0.36.8
 2022-02-15 11:20:57 +01:00
Alexandre BODIN
696c1c3336
Merge pull request #12531 from strapi/dependabot/npm_and_yarn/chalk-4.1.2 
Bump chalk from 4.1.1 to 4.1.2
 2022-02-15 11:18:02 +01:00
Konstantin Münster
497039e135
Update sharp in upload plugin 2022-02-15 11:06:04 +01:00
soupette
2c6d572f77 Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2022-02-15 10:41:13 +01:00
Alexandre BODIN
a25f192aca
Merge pull request #12528 from strapi/dependabot/npm_and_yarn/vm2-3.9.7 
Bump vm2 from 3.9.5 to 3.9.7
 2022-02-15 10:14:25 +01:00
dependabot[bot]
c8aa355e80
Bump chalk from 4.1.1 to 4.1.2 
Bumps [chalk](https://github.com/chalk/chalk) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/chalk/chalk/releases)
- [Commits](https://github.com/chalk/chalk/compare/v4.1.1...v4.1.2)

---
updated-dependencies:
- dependency-name: chalk
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-15 09:06:03 +00:00
dependabot[bot]
9c89f1ba3e
Bump msw from 0.35.0 to 0.36.8 
Bumps [msw](https://github.com/mswjs/msw) from 0.35.0 to 0.36.8.
- [Release notes](https://github.com/mswjs/msw/releases)
- [Changelog](https://github.com/mswjs/msw/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mswjs/msw/compare/v0.35.0...v0.36.8)

---
updated-dependencies:
- dependency-name: msw
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-15 09:05:51 +00:00
dependabot[bot]
fedb26bb90
Bump jest-cli from 26.0.1 to 26.6.3 
Bumps [jest-cli](https://github.com/facebook/jest/tree/HEAD/packages/jest-cli) from 26.0.1 to 26.6.3.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v26.6.3/packages/jest-cli)

---
updated-dependencies:
- dependency-name: jest-cli
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-15 09:05:36 +00:00
soupette
7f0d73eee3 Fix conflicts with yarn.lock 
Signed-off-by: soupette <cyril@strapi.io>
 2022-02-15 09:50:31 +01:00
Gustav Hansen
dfdba4fc9d
Merge pull request #12504 from godzzo/godzzo/issue12498 
Fixing Drag ordering bug with Nested Component.
 2022-02-15 09:01:08 +01:00
Dieter Sting
bc48274555
Merge pull request #12042 from sunnysonx/fix/generator 
Fix: Corrected file paths when generating CTs, APIs, Controllers, Middlewares, Policies, Services inside Plugins
 2022-02-15 08:22:38 +01:00
dependabot[bot]
6e5926a9ba
Bump vm2 from 3.9.5 to 3.9.7 
Bumps [vm2](https://github.com/patriksimek/vm2) from 3.9.5 to 3.9.7.
- [Release notes](https://github.com/patriksimek/vm2/releases)
- [Changelog](https://github.com/patriksimek/vm2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/patriksimek/vm2/compare/3.9.5...3.9.7)

---
updated-dependencies:
- dependency-name: vm2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-15 00:53:33 +00:00
Jean-Sébastien Herbaux
5da5c3a8f7
Merge pull request #12467 from strapi/enhancement/gql-artifacts-generation 
Add configuration options to generate graphql schema + types
 2022-02-14 16:48:09 +01:00
Convly
97254f8d42 Use strapi.config.get instead of process.env 2022-02-14 14:02:06 +01:00
Alexandre BODIN
29bdadf329
Merge pull request #12517 from strapi/dependabot/npm_and_yarn/eslint-plugin-redux-saga-1.3.2 
Bump eslint-plugin-redux-saga from 1.2.1 to 1.3.2
 2022-02-14 13:52:14 +01:00
Alexandre BODIN
8b436e2fc1
Merge pull request #12516 from strapi/dependabot/npm_and_yarn/chokidar-3.5.3 
Bump chokidar from 3.5.1 to 3.5.3
 2022-02-14 13:46:09 +01:00
Alexandre BODIN
5ac3dd5102
Merge pull request #12515 from strapi/dependabot/npm_and_yarn/request-2.88.2 
Bump request from 2.87.0 to 2.88.2
 2022-02-14 13:45:47 +01:00
Alexandre BODIN
1a0fdfe3b5
Merge pull request #12514 from strapi/dependabot/npm_and_yarn/husky-3.1.0 
Bump husky from 3.0.0 to 3.1.0
 2022-02-14 13:45:31 +01:00
Convly
974b33b336 Add dedicated configuration option for shouldGenerateArtifacts: generateArtifacts 2022-02-14 13:45:13 +01:00
Alexandre BODIN
4ebeda2256
Merge pull request #12037 from tuxuuman/optimizing-and-refactoring 
optimization and refactoring the verify function
 2022-02-14 12:18:44 +01:00
soupette
3a2c4b905b Put CM links injection zone on top of the other links 
Signed-off-by: soupette <cyril@strapi.io>
 2022-02-14 11:06:41 +01:00
Convly
ae7731ce31 Add configuration options to generate graphql schema + types 2022-02-14 11:01:24 +01:00
dependabot[bot]
7c47b2e6cb
Bump eslint-plugin-redux-saga from 1.2.1 to 1.3.2 
Bumps [eslint-plugin-redux-saga](https://github.com/pke/eslint-plugin-redux-saga) from 1.2.1 to 1.3.2.
- [Release notes](https://github.com/pke/eslint-plugin-redux-saga/releases)
- [Commits](https://github.com/pke/eslint-plugin-redux-saga/commits)

---
updated-dependencies:
- dependency-name: eslint-plugin-redux-saga
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-14 09:07:19 +00:00
dependabot[bot]
c4edfa6ca8
Bump chokidar from 3.5.1 to 3.5.3 
Bumps [chokidar](https://github.com/paulmillr/chokidar) from 3.5.1 to 3.5.3.
- [Release notes](https://github.com/paulmillr/chokidar/releases)
- [Commits](https://github.com/paulmillr/chokidar/compare/3.5.1...3.5.3)

---
updated-dependencies:
- dependency-name: chokidar
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-14 09:07:01 +00:00
dependabot[bot]
bb830d87d7
Bump request from 2.87.0 to 2.88.2 
Bumps [request](https://github.com/request/request) from 2.87.0 to 2.88.2.
- [Release notes](https://github.com/request/request/releases)
- [Changelog](https://github.com/request/request/blob/master/CHANGELOG.md)
- [Commits](https://github.com/request/request/commits)

---
updated-dependencies:
- dependency-name: request
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-14 09:06:49 +00:00
dependabot[bot]
00117daea0
Bump husky from 3.0.0 to 3.1.0 
Bumps [husky](https://github.com/typicode/husky) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/typicode/husky/releases)
- [Commits](https://github.com/typicode/husky/compare/v3.0.0...v3.1.0)

---
updated-dependencies:
- dependency-name: husky
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-14 09:06:32 +00:00
Gustav Hansen
e5402d09d3
Merge pull request #12511 from strapi/dependabot/npm_and_yarn/follow-redirects-1.14.8 
Bump follow-redirects from 1.14.7 to 1.14.8
 2022-02-14 10:05:45 +01:00
Gustav Hansen
150a7b94cc AssetCard: Update snapshot tests 2022-02-14 08:53:07 +01:00
dependabot[bot]
bef2ff79cf
Bump follow-redirects from 1.14.7 to 1.14.8 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-14 07:47:30 +00:00
Gustav Hansen
75968d74ab
Merge pull request #12481 from strapi/dependabot/npm_and_yarn/eslint-plugin-jsdoc-36.1.1 
Bump eslint-plugin-jsdoc from 36.1.0 to 36.1.1
 2022-02-14 08:47:24 +01:00
Gustav Hansen
543a4149fe
Merge pull request #12482 from strapi/dependabot/npm_and_yarn/axios-mock-adapter-1.20.0 
Bump axios-mock-adapter from 1.19.0 to 1.20.0
 2022-02-14 08:46:56 +01:00
Gustav Hansen
9f610976cd
Merge pull request #12483 from strapi/dependabot/npm_and_yarn/testing-library/react-11.2.7 
Bump @testing-library/react from 11.2.6 to 11.2.7
 2022-02-14 08:46:35 +01:00
godzzo
e1e4e89686 Fixing Drag ordering with Nested Component. 
Fixes #12498
 2022-02-13 15:24:51 +01:00
sunnyson
989cfe3ec5
remove unused import 
Co-authored-by: Dieter Sting <3165079+Elhebert@users.noreply.github.com>
 2022-02-11 22:31:26 +02:00
Alexandre BODIN
de7a92d566
Merge pull request #12480 from strapi/dependabot/npm_and_yarn/eslint-7.32.0 
Bump eslint from 7.25.0 to 7.32.0
 2022-02-11 14:58:53 +01:00
Alexandre BODIN
205c945292
Merge pull request #12410 from smoothdvd/patch-1 
remove extra '/' in baseURL
 2022-02-11 14:58:35 +01:00
Gustav Hansen
6099de95a1
Merge pull request #12398 from strapi/content-10_resizable-fields 
CM: Make fields resizable
 2022-02-11 14:35:45 +01:00
Gustav Hansen
4136ecf254 CM: Automatically format row layouts after changing the field size 
Co-authored-by: Cyril Lopez <cyril@strapi.io>
 2022-02-11 13:36:18 +01:00
Gustav Hansen
408f29ec60 chore: lint code 2022-02-11 13:36:18 +01:00
Gustav Hansen
790e384105 CM: Add missing prop-types 2022-02-11 13:36:18 +01:00