yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-20 05:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,115 Commits 123 Branches 496 Tags
Commit Graph

6280 Commits

Author SHA1 Message Date
Gustav Hansen
5f24350a48
Merge branch 'main' into chore/update-testing-library-react 2022-11-15 11:54:47 +01:00
Gustav Hansen
db6f0cd2b7
Merge pull request #14866 from strapi/chore/update-ds 
chore: update design-system to 1.2.8
 2022-11-15 11:53:43 +01:00
Gustav Hansen
65597622c6 Chore: Update @testing-library/react to 12.1.4 2022-11-15 11:15:30 +01:00
Gustav Hansen
6790ed2940
Merge pull request #14860 from strapi/chore/update-testing-hooks 
Chore: Update @testing-library/react-hooks to 8.0.1
 2022-11-15 11:12:33 +01:00
Gustav Hansen
100e78cb62
Merge pull request #14858 from strapi/chore/update-testing-library-dom 
Chore: Update @testing-library/dom to 8.19.0
 2022-11-15 11:12:11 +01:00
Josh
f0e94fde66 chore: update design-system to 1.2.8 2022-11-15 09:01:04 +00:00
Josh
b5e75847ca
Merge pull request #14850 from strapi/fix/dynamic-zone-reorder-values 2022-11-15 08:42:59 +00:00
Gustav Hansen
ee75ce9e32 Chore: Update @testing-library/react-hooks to 8.0.1 2022-11-14 18:39:19 +01:00
Gustav Hansen
03d815ea17 Chore: Update @testing-library/dom to 8.19.0 2022-11-14 18:38:56 +01:00
Josh
5a5d4b192a fix: mainField name 2022-11-14 16:21:04 +00:00
Josh
3f7eb66647 chore: pr amends 2022-11-14 16:04:26 +00:00
Julie Plantey
11c5d88c49
Merge pull request #14754 from dmoKruso/fix-en-lang 
Update en.json
 2022-11-14 16:04:01 +01:00
Josh
8f708964ea refactor: refactor from another PR from main 2022-11-14 12:37:08 +00:00
Josh
8c83e9d508 Merge branch 'main' into fix/dynamic-zone-reorder-values 2022-11-14 12:36:36 +00:00
Josh
0dee68a41d fix: broken test with AddComponentButton 2022-11-14 12:21:02 +00:00
Josh
cb9ed96340 test: add DynamicZone index tests 2022-11-14 12:16:49 +00:00
Josh
7335dc0844 test: add tests for DynamicComponent 2022-11-14 11:45:22 +00:00
Josh
c58d5a8692 test: add tests for DynamicZone sub components 2022-11-14 10:26:34 +00:00
dependabot[bot]
5366eb64fa
chore(deps): bump css-loader from 6.7.1 to 6.7.2 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 6.7.1 to 6.7.2.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v6.7.1...v6.7.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-14 09:19:07 +00:00
Gustav Hansen
5055296e4a
Merge pull request #14667 from strapi/dependabot/npm_and_yarn/ci-info-3.5.0 
chore(deps): bump ci-info from 3.3.2 to 3.5.0
 2022-11-11 14:01:49 +01:00
Gustav Hansen
d37c693b88
Merge pull request #14668 from strapi/dependabot/npm_and_yarn/fortawesome/fontawesome-svg-core-6.2.0 
chore(deps): bump @fortawesome/fontawesome-svg-core from 6.1.2 to 6.2.0
 2022-11-11 14:01:10 +01:00
Gustav Hansen
ab1d9e66b3 Chore: Fix eslint errors 2022-11-11 13:10:56 +01:00
Gindilla Péter
9b2d5b0e6f fixing format issues (lint (node: 18)) 2022-11-11 13:03:50 +01:00
Gindilla Péter
46851af65a fixing 'id' mainField (no title field), and empty display value not need separator. 2022-11-11 13:03:50 +01:00
Godzzo
20ccfeb2ac separate imports for better tree shaking 
Co-authored-by: Gustav Hansen <gu@stav.dev>
 2022-11-11 13:03:50 +01:00
godzzo
56607b6842 adding wrapper (connect, select) for using mainValue as prop in DynamicZone/Component 2022-11-11 13:03:50 +01:00
godzzo
20f7fedd9c Remove length limit from displayedValue, and move useMainValue.js to the proper hooks/ folder. 2022-11-11 13:03:50 +01:00
godzzo
600df900f1 decouple the getDisplayedValue logic for unit testing from useMainValue and add a unit test for it - without call the test. 2022-11-11 13:03:50 +01:00
godzzo
7afa200622 console.log removed, mainValue length limited to 50 chars, componentFieldName (string) parameter reorged to componentFieldPath (array) 2022-11-11 13:03:50 +01:00
godzzo
469ff7e100 DynamicZone - extend FriendlyName with MainValue like RepeatableComponent 
This commit fixes #12499
 2022-11-11 13:03:50 +01:00
Josh
4bf9291ccd refactor: existing DZ tests 2022-11-11 11:58:54 +00:00
Gustav Hansen
a13b60d441
Merge pull request #14790 from cooperwfloyd/fix/upload-alt-caption-filename 
prevent caption and alternativeText from automatically populating with file name on upload
 2022-11-11 12:55:36 +01:00
Josh
9487d0c9a5 refactor: simplify component 2022-11-10 17:47:26 +00:00
Gustav Hansen
2ab5f01d64 CM: Remove unused icon components 
Co-authored-by: Josh Ellis <josh.ellis@strapi.io>
 2022-11-10 17:37:40 +01:00
Jamie Howard
ae4b342bc4 Merge remote-tracking branch 'origin/main' into fix/relations/rel-error-handling 2022-11-10 15:21:56 +00:00
Jamie Howard
47975952a1 chore(entity-validator): refactor to use reduce 2022-11-10 15:20:31 +00:00
Gustav Hansen
29038e2c50
Merge pull request #14823 from strapi/fix/api-tests-living-dead 
Remove tests relation-list.test.api.js & relations.test.api.js
 2022-11-10 13:15:16 +01:00
Jamie Howard
37d14ac49b test(content-manager): basic-dz api 2022-11-10 11:55:01 +00:00
Pierre Noël
13cbc31497 remove tests relation-list.test.api.js & relations.test.api.js 2022-11-09 19:35:56 +01:00
Mark Kaylor
c4150aa613 Revert timeout to original 2022-11-09 18:20:58 +01:00
Mark Kaylor
9229d53ad1 Merge branch 'chore/improve-maketplace-tests' of github.com:strapi/strapi into chore/improve-maketplace-tests 2022-11-09 17:55:16 +01:00
Mark Kaylor
e06ee53c43 Add back timeout for waitFor 2022-11-09 17:54:52 +01:00
Jamie Howard
dd26848f13 Merge remote-tracking branch 'origin/main' into fix/relations/rel-error-handling 2022-11-09 16:15:02 +00:00
Jamie Howard
6add2542e9 Merge branch 'main' into fix/relations/rel-error-handling 2022-11-09 16:11:07 +00:00
markkaylor
2d357b540c
Merge branch 'main' into chore/improve-maketplace-tests 2022-11-09 17:07:11 +01:00
Mark Kaylor
b9850900d5 Increase timeout for gh actions 2022-11-09 17:06:38 +01:00
Mark Kaylor
b16d10249b Reduce use of getByRole to improve performance 2022-11-09 16:22:43 +01:00
Jamie Howard
f8f330d2e6 chore: test organisation 
fix: relations existence checks
 2022-11-09 15:08:06 +00:00
dependabot[bot]
be372dfcdf
chore(deps): bump ci-info from 3.3.2 to 3.5.0 
Bumps [ci-info](https://github.com/watson/ci-info) from 3.3.2 to 3.5.0.
- [Release notes](https://github.com/watson/ci-info/releases)
- [Changelog](https://github.com/watson/ci-info/blob/master/CHANGELOG.md)
- [Commits](https://github.com/watson/ci-info/compare/v3.3.2...v3.5.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-09 14:52:51 +00:00
Convly
33debd5701 v4.5.0 2022-11-09 15:47:52 +01:00