yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-22 06:50:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,027 Commits 123 Branches 496 Tags
Commit Graph

26027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dogusdeniz
11923a820f
update : fixed lint error 2023-01-11 09:56:12 +03:00
dogusdeniz
acdc56b296
Merge pull request #1 from dogusdeniz/master 
Merge branch 'main' into v4/generator-migration
 2023-01-11 03:33:33 +03:00
DMehaffy
2e99401d8c
Merge pull request #15399 from strapi/tooling/prevent-ee-license-checks-for-api-tests 
Prevent license ping for api tests
 2023-01-10 12:28:05 -07:00
DMehaffy
82947f0375
Merge pull request #15397 from strapi/security/fixJWT 
Fix CVE-2022-23539 / CVE-2022-23541 / CVE-2022-23540 / CVE-2022-23529
 2023-01-10 12:26:16 -07:00
Convly
0c00c19332 Prevent license ping for api tests 2023-01-10 16:38:36 +01:00
Ben Irvin
c0bd11c47b
Merge pull request #15374 from denisukvadim/bagfix/15308 
fix https://github.com/strapi/strapi/issues/15308
 2023-01-10 16:07:19 +01:00
derrickmehaffy
c770a253ba Fix CVE-2022-23539 / CVE-2022-23541 / CVE-2022-23540 / CVE-2022-23529 2023-01-10 07:50:43 -07:00
dogusdeniz
939c52779a
update: Added migration generate with CLI 2023-01-10 16:54:21 +03:00
Ben Irvin
17a547e78f
Merge branch 'main' into bagfix/15308 2023-01-10 11:07:30 +01:00
Jean-Sébastien Herbaux
921d30961d
Merge pull request #15385 from strapi/fix/email-templates-interpolation 2023-01-10 10:45:33 +01:00
Julie Plantey
479bdde67e
Merge pull request #15032 from lkho/pr/admin-content-type-builder-nav-sort 
[admin] fix left menu sorting behaviour
 2023-01-10 10:36:50 +01:00
Convly
56aa69f472 Use lodash fp instead of lodash 2023-01-10 10:34:49 +01:00
Convly
6f07d33f88 Disable lodash template's escape 2023-01-09 18:28:30 +01:00
Christian
e2d6cc685f
Merge pull request #15295 from strapi/chore/document-fetch-client 
Document the useFetchClient hook
 2023-01-09 17:27:29 +01:00
Convly
7c391c2c19 Merge branch 'main' of github.com:strapi/strapi into fix/email-templates-interpolation 2023-01-09 16:53:21 +01:00
Julie Plantey
835b47f433 fix sort CM LeftMenu 2023-01-09 15:58:27 +01:00
Gustav Hansen
af53985b56
Merge pull request #15344 from strapi/dependabot/npm_and_yarn/json5-1.0.2 
chore(deps): bump json5 from 1.0.1 to 1.0.2
 2023-01-09 14:59:53 +01:00
Josh
c2f8a6369c
Merge pull request #15381 from strapi/feat/admin-modals-closing 2023-01-09 13:58:07 +00:00
Josh
107e0d59b9 feat: add in prompt to CTB modals to avoid premature closing and data loss 2023-01-09 12:13:16 +00:00
dependabot[bot]
197091f1eb chore(deps): bump json5 from 1.0.1 to 1.0.2 
Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-09 12:41:44 +01:00
Pierre Noël
5c140061f6
Merge pull request #15341 from strapi/dependabot/npm_and_yarn/aws-sdk-2.1287.0 
chore(deps): bump aws-sdk from 2.1260.0 to 2.1287.0
 2023-01-09 12:27:49 +01:00
denisukvadim
e137627f07
fix runMigrations (15308) 2023-01-07 01:36:38 +02:00
Gustav Hansen
16fb8dfe0c
Merge pull request #15288 from ivan-ha/fix/relations-i18n 
fix: translations of RelationInputDataManager
 2023-01-06 10:04:28 +01:00
Ivan Ha
e41226d794 fixup! fix: translations of RelationInputDataManager 2023-01-06 11:43:54 +08:00
Christian Capeans
5b649a345a Fix grammatical mistakes 2023-01-05 13:39:53 +01:00
Christian Capeans
7300e336c1 Fix grammatical mistakes 2023-01-05 11:11:38 +01:00
Ben Irvin
a76b557047
Merge pull request #15349 from strapi/enhancement/lint-staged-cache 2023-01-05 10:19:52 +01:00
Ben Irvin
b6557fd214
Merge pull request #15348 from strapi/chore/prettier-md 2023-01-05 09:46:22 +01:00
Ben Irvin
ef66e3aab4 use cache for lint-staged scripts 2023-01-04 17:27:54 +01:00
Ben Irvin
b43a11ad0a prettier md files 2023-01-04 17:16:16 +01:00
Gustav Hansen
08cf81512b
Merge pull request #15332 from strapi/dependabot/npm_and_yarn/codemirror-5.65.11 
chore(deps): bump codemirror from 5.65.8 to 5.65.11
 2023-01-04 14:59:10 +01:00
Gustav Hansen
62d59fcd02
Merge pull request #15294 from strapi/fix/required-boolean-in-component 
[fix] Boolean field validation in component
 2023-01-04 10:31:56 +01:00
dependabot[bot]
4e1da673f7
chore(deps): bump aws-sdk from 2.1260.0 to 2.1287.0 
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1260.0 to 2.1287.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1260.0...v2.1287.0)

---
updated-dependencies:
- dependency-name: aws-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-04 09:02:29 +00:00
Jamie Howard
aef978999b
Merge pull request #15296 from pataiadam/main 2023-01-03 13:59:23 +00:00
Christian Capeans
fd3475965b Reorganize document 2023-01-03 13:28:23 +01:00
Jamie Howard
a41e972082
Merge pull request #15196 from strapi/fix/close-modal-with-esc 2023-01-03 12:15:25 +00:00
Gustav Hansen
9f4be24fba
Merge pull request #15331 from strapi/dependabot/npm_and_yarn/storybook/builder-webpack5-6.5.15 
chore(deps-dev): bump @storybook/builder-webpack5 from 6.5.9 to 6.5.15
 2023-01-03 13:11:21 +01:00
Gustav Hansen
e358429acc
Merge pull request #15334 from strapi/chore/docs-deployment 
Chore: Bump docs dependencies
 2023-01-03 12:29:05 +01:00
Gustav Hansen
ec0f5bc20a Chore: Bump docs dependencies 2023-01-03 11:03:09 +01:00
Gustav Hansen
65515928a1
Merge pull request #15330 from strapi/fix/docs-cname 
Fix: Prevent CNAME file from being overwritten by the GH action
 2023-01-03 10:46:08 +01:00
dependabot[bot]
0861118149
chore(deps): bump codemirror from 5.65.8 to 5.65.11 
Bumps [codemirror](https://github.com/codemirror/basic-setup) from 5.65.8 to 5.65.11.
- [Release notes](https://github.com/codemirror/basic-setup/releases)
- [Changelog](https://github.com/codemirror/basic-setup/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/basic-setup/commits)

---
updated-dependencies:
- dependency-name: codemirror
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-03 09:04:32 +00:00
dependabot[bot]
b7f3b576be
chore(deps-dev): bump @storybook/builder-webpack5 from 6.5.9 to 6.5.15 
Bumps [@storybook/builder-webpack5](https://github.com/storybookjs/storybook/tree/HEAD/lib/core) from 6.5.9 to 6.5.15.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.15/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.15/lib/core)

---
updated-dependencies:
- dependency-name: "@storybook/builder-webpack5"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-03 09:03:02 +00:00
Gustav Hansen
30355eff0b Fix: Prevent CNAME file from being overwritten by the GH action 2023-01-03 09:14:28 +01:00
Gustav Hansen
129d88cccc
Merge pull request #15278 from ivan-ha/fix/zh-translations 
fix: broken translations in EditFolderDialog and various zh translations in Media Library
 2023-01-02 12:29:31 +01:00
Gustav Hansen
4f01dd1c8c
Merge pull request #15289 from ivan-ha/fix/content-manager-i18n 
fix: zh translations of content-manager.containers.Edit.information.by
 2023-01-02 12:26:54 +01:00
Ben Irvin
3bf787764b
Merge pull request #15208 from GregorSondermeier/patch-1 2023-01-02 12:19:31 +01:00
Ben Irvin
94d8b6c1fa
Merge pull request #15213 from strapi/enchancement/eslint-cache 2023-01-02 12:00:59 +01:00
Gustav Hansen
5af5384856
Merge pull request #15314 from strapi/dependabot/npm_and_yarn/nx-14.8.6 
chore(deps-dev): bump nx from 14.4.2 to 14.8.6
 2023-01-02 11:54:39 +01:00
dependabot[bot]
29fcd21cfb
chore(deps-dev): bump nx from 14.4.2 to 14.8.6 
Bumps [nx](https://github.com/nrwl/nx/tree/HEAD/packages/nx) from 14.4.2 to 14.8.6.
- [Release notes](https://github.com/nrwl/nx/releases)
- [Commits](https://github.com/nrwl/nx/commits/14.8.6/packages/nx)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-02 09:02:30 +00:00
Ben Irvin
d2f4bf4512 add cache-location 2023-01-02 09:56:21 +01:00