yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-03 19:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,431 Commits 122 Branches 507 Tags
Commit Graph

20431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gustav Hansen
9bf057b9fb CM: Make fields resizable 2022-02-11 13:36:18 +01:00
Gustav Hansen
c434b61e1c CM: Add tests for field helper functions 2022-02-11 13:36:18 +01:00
Gustav Hansen
edb2f0f95e CM: Create helper functions to get/ set fieldSizes 2022-02-11 13:36:18 +01:00
Gustav Hansen
57eedcdc98 AssetCard: update card actions to use the latest design-system 2022-02-11 13:29:50 +01:00
dependabot[bot]
e91adb05f4
Bump eslint from 7.25.0 to 7.32.0 
Bumps [eslint](https://github.com/eslint/eslint) from 7.25.0 to 7.32.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.25.0...v7.32.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-11 12:19:20 +00:00
Gustav Hansen
44511e6232 AssetCard: Update snapshot test 2022-02-11 13:19:05 +01:00
Gustav Hansen
0e97b4cb90 AssetCard: move extension prop into commonProps 2022-02-11 13:15:41 +01:00
Gustav Hansen
7ec1e978b1 AssetCard: simplify common props 2022-02-11 13:15:41 +01:00
Gustav Hansen
7cba515655 UploadDialog: User proper design-system spacing 2022-02-11 13:15:41 +01:00
Gustav Hansen
5a6bc81f3d UploadDialog: allow removing assets before uploading 2022-02-11 13:15:41 +01:00
Gustav Hansen
3c9ab240de
Merge pull request #12473 from strapi/feature/ds-alpha-75 
chore: Bump design-system version
 2022-02-11 13:14:34 +01:00
smoothdvd
65c03caede
Update packages/plugins/users-permissions/server/bootstrap/index.js 
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2022-02-11 18:51:01 +08:00
Gustav Hansen
e8cf8aabb7
Merge pull request #12463 from strapi/hotfix/ctb-curve-alignment 
CTB: Fix alignment of curve icons in production mode
 2022-02-11 11:35:34 +01:00
tuxuuman
d3a0b225a6
Update packages/plugins/users-permissions/server/strategies/users-permissions.js 
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2022-02-11 15:32:14 +05:00
cyril lopez
f3d3c322da
Merge pull request #12444 from strapi/fix-kitchensink 
Fix kitchensink
 2022-02-11 11:20:33 +01:00
Alexandre BODIN
02c93fe832
Merge pull request #12465 from strapi/plugin-documentation/fix-custom-settings 
Fix custom settings override
 2022-02-11 10:53:29 +01:00
Alexandre BODIN
96938b4779
Merge pull request #12468 from strapi/chore/upgrade-fp 
Enhancement: Upgrade fp version to 3.2.2
 2022-02-11 10:51:53 +01:00
Gustav Hansen
270fb6b288 chore: Update snapshot tests 2022-02-11 10:49:54 +01:00
dependabot[bot]
7f3f7125e6
Bump @testing-library/react from 11.2.6 to 11.2.7 
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 11.2.6 to 11.2.7.
- [Release notes](https://github.com/testing-library/react-testing-library/releases)
- [Changelog](https://github.com/testing-library/react-testing-library/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testing-library/react-testing-library/compare/v11.2.6...v11.2.7)

---
updated-dependencies:
- dependency-name: "@testing-library/react"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-11 09:44:19 +00:00
dependabot[bot]
bcc2675735
Bump axios-mock-adapter from 1.19.0 to 1.20.0 
Bumps [axios-mock-adapter](https://github.com/ctimmerm/axios-mock-adapter) from 1.19.0 to 1.20.0.
- [Release notes](https://github.com/ctimmerm/axios-mock-adapter/releases)
- [Changelog](https://github.com/ctimmerm/axios-mock-adapter/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ctimmerm/axios-mock-adapter/compare/v1.19.0...v1.20.0)

---
updated-dependencies:
- dependency-name: axios-mock-adapter
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-11 09:43:46 +00:00
dependabot[bot]
4a158b8d3f
Bump eslint-plugin-jsdoc from 36.1.0 to 36.1.1 
Bumps [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) from 36.1.0 to 36.1.1.
- [Release notes](https://github.com/gajus/eslint-plugin-jsdoc/releases)
- [Commits](https://github.com/gajus/eslint-plugin-jsdoc/compare/v36.1.0...v36.1.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-jsdoc
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-11 09:43:16 +00:00
Maxime Castres
347bede831 Fix: Upgrade fp version to 3.3.2 2022-02-11 10:08:49 +01:00
sunnyson
43c58cb692
Update packages/generators/generators/lib/plops/api.js 
Co-authored-by: Dieter Sting <3165079+Elhebert@users.noreply.github.com>
 2022-02-10 21:55:29 +02:00
ronronscelestes
c08848f01f feat(guided-tour): AuthenticatedApp guided tour tests 2022-02-10 20:02:38 +01:00
Pierre Noël
ef0cb82192 remove dead code 2022-02-10 18:38:47 +01:00
Gustav Hansen
507f7c4094 CTB: Fix alignment of curve icons in production mode 2022-02-10 18:18:29 +01:00
Gustav Hansen
c106d19dd5
Merge pull request #12464 from strapi/hotfix/ctb-add-component-typo 
DynamicZoneList: fix cta typography
 2022-02-10 18:13:47 +01:00
Gustav Hansen
73853a16da chore: Update snapshot tests 2022-02-10 18:04:42 +01:00
Gustav Hansen
8e6204251d chore: Bump design-system version 2022-02-10 18:03:28 +01:00
vincentbpro
a5dba2203c test(guided-tour): added homepage snapshot 2022-02-10 17:20:06 +01:00
Maxime Castres
8659741ab8 Enhancement: Upgrade fp version to 3.2.2 2022-02-10 17:09:06 +01:00
vincentbpro
1467c23c40 test(guided-tour): homepage: moved tests from app homepage to GT homepage 2022-02-10 16:48:41 +01:00
vincentbpro
41743deb77 test(guided-tour): added reducer tests for Modal 2022-02-10 16:26:04 +01:00
vincentbpro
d977670a4c Merge branch 'feature/guided-tour' of github.com:strapi/strapi into feature/guided-tour 2022-02-10 16:12:51 +01:00
ronronscelestes
0554469b2b Merge branch 'master' of https://github.com/strapi/strapi into feature/usecase-ui 2022-02-10 15:59:08 +01:00
Mark Kaylor
46f09b3a45 fix custom settings override 2022-02-10 15:55:29 +01:00
Gustav Hansen
8475dee2b5 chore: Update snapshot tests 2022-02-10 15:44:44 +01:00
Gustav Hansen
bc35e75645 DynamicZoneList: fix cta typography 2022-02-10 15:43:25 +01:00
ronronscelestes
9efa7cd0ff fix(usecase): removed CancelToken legacy 2022-02-10 15:39:41 +01:00
vincentbpro
eed60c28f4 test(guided-tour): added reducer test for set_skipped 2022-02-10 15:02:55 +01:00
ronronscelestes
552c29b08f fix(guided-tour): GuidedTourProvider story fix 2022-02-10 14:57:58 +01:00
ronronscelestes
b80678943e fix(guided-tour): CTB and CM sections validated with Single type as well 2022-02-10 14:36:00 +01:00
ronronscelestes
a72c1c0c3b fix(usecase): fix persona skippable but still send user contact 2022-02-10 14:16:00 +01:00
Gustav Hansen
39f9d54f4d
Merge pull request #12306 from strapi/dependabot/npm_and_yarn/swc-node/jest-1.4.3 
Bump @swc-node/jest from 1.1.0 to 1.4.3
 2022-02-10 14:09:55 +01:00
Gustav Hansen
d57825b79d
Merge pull request #12445 from smoothdvd/patch-2 
Clear datetime or date should set value to null
 2022-02-10 13:48:22 +01:00
dependabot[bot]
032800020b
Bump @swc-node/jest from 1.1.0 to 1.4.3 
Bumps [@swc-node/jest](https://github.com/Brooooooklyn/swc-node) from 1.1.0 to 1.4.3.
- [Release notes](https://github.com/Brooooooklyn/swc-node/releases)
- [Commits](https://github.com/Brooooooklyn/swc-node/compare/@swc-node/jest@1.1.0...@swc-node/jest@1.4.3)

---
updated-dependencies:
- dependency-name: "@swc-node/jest"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-10 12:23:53 +00:00
Gustav Hansen
80f161c34e
Merge pull request #12305 from strapi/dependabot/npm_and_yarn/enzyme-3.11.0 
Bump enzyme from 3.9.0 to 3.11.0
 2022-02-10 13:17:51 +01:00
Gustav Hansen
77f54aca68
Merge pull request #12456 from strapi/dependabot/npm_and_yarn/testing-library/user-event-13.5.0 
Bump @testing-library/user-event from 13.1.9 to 13.5.0
 2022-02-10 13:14:34 +01:00
Pierre Noël
c2b8a4ee98 parse boolean in convertQueryParam instead of parsing in database 2022-02-10 13:12:16 +01:00
Gustav Hansen
798b29f92b DateTimePicker: trigger change events regardless of the value 2022-02-10 13:10:57 +01:00