yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-03 05:39:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 115 Branches 491 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ronronscelestes
25493390f0 fix(usecase): review feedback 2022-02-15 17:20:27 +01:00
markkaylor
76142d1366
Merge pull request #12491 from strapi/strapi-market-links 
Link to web marketplace from admin
 2022-02-15 17:18:19 +01:00
ronronscelestes
9464982d27 fix(guided-tour): icon size in rem for StepNumber 2022-02-15 16:42:38 +01:00
Gustav Hansen
75fdc2415c chore: Update snapshot tests 2022-02-15 16:40:15 +01:00
Rémi de Juvigny
7cfe00b9ac Revert accidental snapshot update 2022-02-15 16:38:18 +01:00
Rémi de Juvigny
ffddd8c592 Update snapshot 2022-02-15 16:38:18 +01:00
Rémi de Juvigny
3977ac999c Link to web marketplace from admin 2022-02-15 16:38:17 +01:00
vincentbpro
a67f392f4f fix(guided-tour): using refs for startSection 2022-02-15 16:18:56 +01:00
Gustav Hansen
a7cf1b75e2 chore: Bump design-system 2022-02-15 16:01:23 +01:00
ronronscelestes
0bc9af74ba feat(guided-tour): setSkipped at true only when super admin register 2022-02-15 16:00:12 +01:00
Pierre Noël
1c1b08b8ac remove useless code 2022-02-15 15:03:48 +01:00
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
vincentbpro
fd11e2d361 fix(guided-tour): removed useCallbacks 2022-02-15 10:52:02 +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
Pierre Noël
a812010b85 Merge branch 'content-42/fix-date-field' of github.com:strapi/strapi into content-42/fix-date-field 2022-02-15 09:52:41 +01:00
Pierre Noël
47cd6b6290 fix when match returns null 2022-02-15 09:52:22 +01: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
Gustav Hansen
6860c5574c
Merge pull request #12267 from strapi/fix/datepicker-format 
Date: Store & display ISO dates instead of datetimes
 2022-02-15 08:57:19 +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
Rémi de Juvigny
663f0bc901
Merge pull request #12525 from strapi/fetch-plugins 
[MARKET] Fetch plugins
 2022-02-14 19:15:34 +01:00
Mark Kaylor
13ea6fd1ca set default api url 2022-02-14 18:12:57 +01:00
Pierre Noël
af21bba606 handle object and array for and operator 2022-02-14 17:24:08 +01: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
ronronscelestes
d0c2e0d6f0 feedback(usecase): removed question mark from form title 2022-02-14 16:47:54 +01:00
Gustav Hansen
6a1396a490 GenericInput: change date field to only handle dates 2022-02-14 16:33:06 +01:00
ronronscelestes
90864429a3 merge conflicts yarn.lock 2022-02-14 15:43:14 +01:00
ronronscelestes
66f9d42f9e feat(usecase): return LoadingIndicatorPage when not coming from register 2022-02-14 15:36:49 +01:00
vincentbpro
93edf3c96c test(guided-tour): removed useless object spread 2022-02-14 15:13:06 +01:00
Mark Kaylor
4695f6a4e0 log data 2022-02-14 15:12:44 +01:00
Mark Kaylor
eda76ecc7c update translation 2022-02-14 14:52:05 +01:00
Pierre Noël
3d3d51193e enrich test 2022-02-14 14:13:25 +01:00
Convly
97254f8d42 Use strapi.config.get instead of process.env 2022-02-14 14:02:06 +01:00