yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 16:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,027 Commits 129 Branches 498 Tags
Commit Graph

6969 Commits

Author SHA1 Message Date
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
derrickmehaffy
c770a253ba Fix CVE-2022-23539 / CVE-2022-23541 / CVE-2022-23540 / CVE-2022-23529 2023-01-10 07:50:43 -07: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
6f07d33f88 Disable lodash template's escape 2023-01-09 18:28:30 +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
Josh
107e0d59b9 feat: add in prompt to CTB modals to avoid premature closing and data loss 2023-01-09 12:13:16 +00: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
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
Jamie Howard
aef978999b
Merge pull request #15296 from pataiadam/main 2023-01-03 13:59:23 +00:00
Jamie Howard
a41e972082
Merge pull request #15196 from strapi/fix/close-modal-with-esc 2023-01-03 12:15:25 +00: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
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
Gustav Hansen
f1ca1e4051
Merge pull request #15284 from strapi/fix/documentation-link-guided-tour 
[fix] Guided tour documentation link
 2023-01-02 09:22:00 +01:00
Convly
0458e88bce Handle object variables & fix sendTemplatedEmail 2022-12-30 19:46:33 +01:00
Convly
d7db946c4e Add strict interpolate & deactivate evaluation in sendTemplatedEmail 2022-12-30 18:59:16 +01:00
Convly
a39fedfb30 Add template in the utils (interpolation helpers) 2022-12-30 18:57:27 +01:00
DMehaffy
566c9ebd22
Merge branch 'main' into chore/v3EOL 2022-12-30 10:05:30 -07:00
Ádám Patai
0bf4e6173e feat: Hungarian admin translations 2022-12-29 19:52:44 +01:00
Julie Plantey
f4e1059993 boolean validation on undefined 2022-12-29 15:14:03 +01:00
Ivan Ha
1827fd6f2c fix: zh translations of content-manager.containers.Edit.information.by 2022-12-29 12:40:07 +08:00
Ivan Ha
4c2574b8d1 fix: translations of RelationInputDataManager 2022-12-29 11:55:26 +08:00
Julie Plantey
d28ec97917
Merge pull request #15261 from ivan-ha/fix/translations-of-CarouselAssetActions 
fix: translations of CarouselAssetActions
 2022-12-28 17:44:50 +01:00
Julie Plantey
ac771047be fixed documentation link and bullet list colors 2022-12-28 16:24:26 +01:00
Ivan Ha
8fee332a98 fixup! fix: various zh translations in Media Library 2022-12-28 22:34:09 +08:00
Convly
8f1988367c v4.5.5 2022-12-28 15:17:36 +01:00
Ivan Ha
9ed95854cc fixup! fix: translations of CarouselAssetActions 2022-12-28 22:09:22 +08:00
Jean-Sébastien Herbaux
29e6833f13
Merge pull request #14593 from gary-alway/disable-migrations-config 2022-12-28 14:58:52 +01:00
Julie Plantey
aa08a102d5
Merge pull request #15258 from ivan-ha/fix/translation-of-profile-experience 
fix: translation of profile language setting
 2022-12-28 12:06:40 +01:00
Ivan Ha
6648646c45 fix: various zh translations in Media Library 2022-12-28 18:06:39 +08:00
Ivan Ha
11711bff4f fix: broken non-EN translations in EditFolderDialog 2022-12-28 18:05:47 +08:00
Jean-Sébastien Herbaux
e912c0a4d7
Merge branch 'main' into disable-migrations-config 2022-12-28 10:33:14 +01:00
derrickmehaffy
ae7c60980c change ratelimit to rateLimit 2022-12-27 09:19:57 -07:00
derrickmehaffy
33bd405a2b refactor config loading 2022-12-27 08:20:38 -07:00
derrickmehaffy
2f87da5a0e Merge remote-tracking branch 'origin/main' into security/adminRateLimit 2022-12-27 08:09:30 -07:00
Ben Irvin
43c6874c70
Merge branch 'main' into fix/delete-duplicate-route-users-delete 2022-12-27 12:13:23 +01:00
Julie Plantey
b76c4139fb
Merge pull request #15254 from strapi/fix/relational-path 
[fix] Relation path setup
 2022-12-27 09:29:33 +01:00
Jamie Howard
5db59f9f37 fix(content-manager): close ListSettingsView/EditFieldForm with escape key or by clicking outside modal 2022-12-23 14:48:51 +00:00
Ivan Ha
e793510d24 fix: translations of CarouselAssetActions 2022-12-23 18:26:32 +08:00
Ivan Ha
863b0a021a fix: Settings.profile.form.section.experience.here in all translation files 2022-12-23 16:50:27 +08:00
Ivan Ha
ae7493f96a fix: wrong translations key in profile -> experience 2022-12-23 16:43:48 +08:00
GitStart
c078ac27e5
Merge branch 'main' into fix/content-manager-crash-on-nonstring-dynamicfield 2022-12-23 04:04:14 +01:00
Julie Plantey
e5e20180ba fix relation path on nested duplicated keys 2022-12-22 19:05:56 +01:00