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
25,440 Commits 129 Branches 498 Tags
Commit Graph

6501 Commits

Author SHA1 Message Date
Josh
befa7981d6
Merge branch 'main' into dependabot/npm_and_yarn/msw-0.49.1 2022-12-05 11:29:05 +00:00
Josh
ac978ad6ed
Merge branch 'main' into dependabot/npm_and_yarn/msw-0.49.1 2022-12-05 11:20:48 +00:00
Josh
fd8163d37b chore: pr amends 2022-12-05 09:31:25 +00:00
Josh
e66352c649 test: fix test for hook & add one surrounding cache 2022-12-05 08:41:57 +00:00
Josh
52a4811d5d refactor: make it quicker to access cache 2022-12-02 17:43:57 +00:00
Josh
38d13deafa fix: use a global cache for custom inputs so they can be accessed anywhere 2022-12-02 17:23:00 +00:00
Marc
9cef257369
Merge pull request #15003 from strapi/fix/many-to-many-relationship-to-the-same-content 2022-12-01 09:25:48 +01:00
Simone
2d93875e30
Merge pull request #14927 from strapi/chore/tracking-edit-field-name 
Tracking system, editing collection name
 2022-11-30 17:00:24 +01:00
Convly
5453885f7a v4.5.3 2022-11-30 16:27:25 +01:00
dependabot[bot]
d8a02ca9b8
chore(deps): bump msw from 0.42.3 to 0.49.1 
Bumps [msw](https://github.com/mswjs/msw) from 0.42.3 to 0.49.1.
- [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.42.3...v0.49.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-30 14:53:50 +00:00
Simone
6fb62ca739
Merge branch 'main' into chore/tracking-edit-field-name 2022-11-30 14:56:18 +01:00
Simone
85425719d1
Merge branch 'main' into chore/tracking-edit-field-name 2022-11-30 14:50:18 +01:00
Ben Irvin
a8c7d46b30 use commander to 8.2.0 2022-11-30 11:58:40 +01:00
Simone
a39b999359
Merge branch 'main' into chore/ds-140 2022-11-30 09:10:23 +01:00
Jean-Sébastien Herbaux
3ebd2db4d6
Merge pull request #14879 from strapi/features/morphs-populate 2022-11-29 17:06:05 +01:00
Pierre Noël
5d9faf3861 fix test - array's order 2022-11-29 14:02:44 +01:00
Pierre Noël
bbd318d845
Merge branch 'main' into fix/github-test-mysql5 2022-11-29 11:31:29 +01:00
markkaylor
1ffef66e64
Merge pull request #14873 from strapi/fix/custom-fields-breaking-inputs 
[Custom fields] Create hook to lazy load custom field components
 2022-11-29 10:28:27 +01:00
Simone Taeggi
3e7d720046 upgrade ds version and tests 2022-11-28 18:02:23 +01:00
Simone
9dc359260f
Merge branch 'main' into chore/tracking-edit-field-name 2022-11-28 17:12:21 +01:00
Pierre Noël
78b8319070 remove unecessary checks in tests breaking with mysql 5 2022-11-28 10:45:30 +01:00
Nathan Pichon
15127e84b0
Merge pull request #14724 from strapi/fix/file-upload-components 
fix(upload-files): do file upload on components too
 2022-11-25 12:00:40 +01:00
Marc-Roig
a7f37ba45d change order column name to inv 2022-11-25 11:50:53 +01:00
Mark Kaylor
0343495ea1 Select custom field uids from layout using reselect 2022-11-23 21:40:53 +01:00
Mark Kaylor
cfd9262878 Merge branch 'main' of github.com:strapi/strapi into fix/custom-fields-breaking-inputs 2022-11-23 21:36:30 +01:00
markkaylor
94cd474940
Merge pull request #14881 from strapi/chore/refactor-edit-view 
[Content manager] Refactor edit view
 2022-11-23 21:26:09 +01:00
Jean-Sébastien Herbaux
f67c4b440f
Merge branch 'main' into features/morphs-populate 2022-11-23 16:13:09 +01:00
Nathan Pichon
4e6a8bf672
Merge branch 'main' into fix/file-upload-components 2022-11-23 15:00:44 +01:00
Mark Kaylor
e63b41b73a Remove comment and named export 2022-11-23 14:01:41 +01:00
Julie Plantey
0c408f9bda
Merge pull request #14883 from alekskorolev3/fix-RU-lang 
Update russian translation
 2022-11-23 13:38:28 +01:00
Alexandre BODIN
7d64a36867
Merge pull request #14870 from jorgeRambla/patch-2 
Resolves https://github.com/strapi/strapi/issues/14869
 2022-11-23 12:18:32 +01:00
Alexandre BODIN
463d78a4c1
Merge pull request #14666 from strapi/dependabot/npm_and_yarn/commander-8.3.0 2022-11-23 12:16:02 +01:00
markkaylor
a91fe47990
Merge branch 'main' into fix/custom-fields-breaking-inputs 2022-11-23 10:24:39 +01:00
Madhuri Sandbhor
c693065ad1
Merge pull request #14814 from strapi/feature/marketplace-additional-sort-options 
[Marketplace] Exp-373 Update the sort options in SelectSort component
 2022-11-23 10:22:52 +01:00
Mark Kaylor
dfac1a9edd Use Set instead of filter 2022-11-23 10:21:58 +01:00
Simone Taeggi
6591dd051b move the condition inside the function 2022-11-23 10:02:26 +01:00
Simone Taeggi
159a40f2e3 Merge branch 'main' into chore/tracking-edit-field-name 2022-11-23 09:55:11 +01:00
markkaylor
34b24b485e
Merge branch 'main' into chore/refactor-edit-view 2022-11-23 09:17:28 +01:00
markkaylor
a6193d04e1
Merge pull request #14590 from strapi/feature/custom-field-default-options 
[Custom fields] Add default value to options
 2022-11-23 09:16:42 +01:00
Simone Taeggi
fa89f174c3 Merge branch 'main' into chore/tracking-edit-field-name 2022-11-23 00:14:26 +01:00
Simone Taeggi
59b86944a3 refactor the event didEditFieldNameOnContentType triggered when we edit the field name 2022-11-23 00:13:19 +01:00
Simone Taeggi
e3fa29997f Merge branch 'main' into chore/tracking-edit-field-name 2022-11-22 19:58:12 +01:00
Artsiom Ulasevich
0e4636b237
Merge branch 'main' into fix-RU-lang 2022-11-22 21:38:30 +03:00
Josh
a73dc6fe78
Merge pull request #14849 from strapi/fix/card-badge 2022-11-22 17:18:53 +00:00
dependabot[bot]
c16f5b9ebb
chore(deps): bump commander from 8.2.0 to 8.3.0 
Bumps [commander](https://github.com/tj/commander.js) from 8.2.0 to 8.3.0.
- [Release notes](https://github.com/tj/commander.js/releases)
- [Changelog](https://github.com/tj/commander.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tj/commander.js/compare/v8.2.0...v8.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-22 17:04:47 +00:00
Alexandre Bodin
bcb1b7f472 v4.5.2 2022-11-22 17:54:52 +01:00
Alexandre BODIN
2574c22b30
Merge pull request #14961 from strapi/chore/fix-webpack-build 2022-11-22 16:45:50 +01:00
Simone Taeggi
8a8b76e034 Merge branch 'main' into chore/tracking-edit-field-name 2022-11-22 16:19:03 +01:00
Julie Plantey
a6c2f79bbc
Merge pull request #14922 from 5idereal/patch-1 
update Traditional Chinese translation
 2022-11-22 16:03:02 +01:00
Josh
e4dd1b262e chore: use stable 1.3.1 of DS 2022-11-22 15:30:02 +01:00