yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-30 04:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,053 Commits 115 Branches 486 Tags
Commit Graph

6989 Commits

Author SHA1 Message Date
Gustav Hansen
eabf3ebc0e EditAssetDialog: Create cropped image in the same folder as the original 2022-12-06 12:13:32 +01:00
Gustav Hansen
a19579634c useEditAsset: Send folder.id instead of full folder object 2022-12-06 12:12:58 +01:00
Daniele Rubetti
f3f06c31e9
Merge branch 'main' into fix/factories-types 2022-12-05 18:56:45 +01:00
Julie Plantey
3835a29126 Merge branch 'main' of https://github.com/strapi/strapi into features/MediaLibrary-listview 2022-12-05 17:32:52 +01:00
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
gitstart
c1faa543ef chore: updates implementation logic 2022-12-05 05:17:58 +00:00
gitstart
37440bb814 Merge commit 'e3c273cf36d7d12547fcc4bea1778df513aedb46' of https://github.com/GitStartHQ/strapi into STRAP-63 2022-12-05 05:17:54 +00:00
Radoslav Zeman
4bf11a59a8 improve SK translations 2022-12-03 23:08:54 +01: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
Daniele Rubetti
af6a52f0fb
Merge branch 'strapi:main' into fix/factories-types 2022-12-02 15:43:46 +01:00
Simone Taeggi
7dea3803e7 update snapshots 2022-12-01 15:17:42 +01:00
Simone Taeggi
bd421af45b Merge branch 'main' into enhancement/date-time-picker-ds-in-strapi 2022-12-01 14:29:56 +01:00
Simone Taeggi
7381c45d76 refactor the imports from the design system 2022-12-01 14:24:43 +01:00
gitstart
d92bd64264 chore: corrects wrong editor focus checking method 2022-12-01 11:28:38 +00:00
Simone
ba11711c7e
Merge branch 'main' into fix/change-strapi-icons-color-in-dashboard 2022-12-01 11:36:41 +01: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
6290d8a68a
Merge branch 'main' into fix/change-strapi-icons-color-in-dashboard 2022-11-30 17:51:29 +01:00
Simone Taeggi
76ce0677f6 update snapshots 2022-11-30 17:43:57 +01:00
Simone Taeggi
1c1ae40675 change the svg path colors 2022-11-30 17:42:16 +01:00
Simone
fcee6194e3
Merge branch 'main' into enhancement/date-time-picker-ds-in-strapi 2022-11-30 17:01:39 +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
574985f9f0
Merge branch 'main' into enhancement/axios-refactoring 2022-11-30 14:57:09 +01:00
Simone
4723894107
Merge branch 'main' into enhancement/date-time-picker-ds-in-strapi 2022-11-30 14:56:51 +01: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 Taeggi
4391d8b56d Merge branch 'main' into enhancement/date-time-picker-ds-in-strapi 2022-11-30 11:45:30 +01:00
dependabot[bot]
e49ee71ce2
chore(deps): bump react-router-dom from 5.2.0 to 5.3.4 
Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 5.2.0 to 5.3.4.
- [Release notes](https://github.com/remix-run/react-router/releases)
- [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md)
- [Commits](https://github.com/remix-run/react-router/commits/v5.3.4/packages/react-router-dom)

---
updated-dependencies:
- dependency-name: react-router-dom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-30 10:45:09 +00:00
Simone Taeggi
612ee1673b remove unnecessary function 2022-11-30 10:12:15 +01:00
Simone Taeggi
5d50cfb19f fix tests review comments 2022-11-30 10:08:36 +01:00
Pierre Noël
e4ceee036e set dominant attribute 2022-11-30 09:22:50 +01:00
Simone
a39b999359
Merge branch 'main' into chore/ds-140 2022-11-30 09:10:23 +01:00
Simone Taeggi
0a68d2d9b6 add another small test 2022-11-29 22:12:07 +01:00
Simone Taeggi
4b6de6c56d remove comments 2022-11-29 21:31:05 +01:00
Simone Taeggi
f7c3d3220f add other tests 2022-11-29 18:56:57 +01:00
Simone Taeggi
20cbf0d630 Merge branch 'main' into enhancement/axios-refactoring 2022-11-29 17:35:58 +01:00
Jean-Sébastien Herbaux
3ebd2db4d6
Merge pull request #14879 from strapi/features/morphs-populate 2022-11-29 17:06:05 +01:00
Simone Taeggi
532030a067 add tests for the interceptors callbacks 2022-11-29 17:00:41 +01:00
Pierre Noël
4884dc3150 put inversedBy only once for many to many relations 2022-11-29 15:59:53 +01:00
Daniele Rubetti
1d0bc17dc6
Merge branch 'strapi:main' into fix/factories-types 2022-11-29 15:43:20 +01:00
Simone Taeggi
70a08c6795 Merge branch 'main' into enhancement/axios-refactoring 2022-11-29 14:23:08 +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