yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-08 08:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,877 Commits 113 Branches 488 Tags
Commit Graph

20877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ronronscelestes
5506bf0bd7 fix(usecase): use intlLabel for options in select 2022-02-14 13:55:55 +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
HichamELBSI
dc96661182 Fix datepicker format 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2022-02-14 13:47:42 +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
ronronscelestes
4934a81aae feedback(usecase): select options with intl labels 2022-02-14 13:44:07 +01:00
ronronscelestes
929bd7eb8b feedback(usecase): removed null return when !isComingFromRegister 2022-02-14 13:35:59 +01:00
ronronscelestes
f78819b057 fix(usecase): changed persona property format send to tracker 2022-02-14 13:34:56 +01:00
Mark Kaylor
bd4c073871 remove .env 2022-02-14 12:42:40 +01:00
Mark Kaylor
1c7abd2ca3 fetch plugins from API proxy 2022-02-14 12:36:33 +01:00
vincentbpro
f564420630 fix(guided-tour): wrapped startSection and setCurrentStep with useCallback hooks 2022-02-14 12:21:11 +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
vincentbpro
466ac108a0 test(guided-tour): added init tests 2022-02-14 11:51:43 +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
vincentbpro
1c9422eac8 Merge branch 'feature/guided-tour' of github.com:strapi/strapi into feature/guided-tour 2022-02-14 10:39:48 +01:00
vincentbpro
c08f37a7f0 test(guided-tour): added stepper snapshots 2022-02-14 10:39:37 +01:00