yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-26 09:42:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 121 Branches 490 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniele Aurilio
c093a70690
Merge branch 'strapi:master' into releases/v4 2022-06-07 20:49:11 +02:00
ronronscelestes
97c97cd968 added test for edit error 2022-06-07 20:13:40 +02:00
ronronscelestes
a6a42f463c fixed form layout 2022-06-07 19:45:22 +02:00
ronronscelestes
cc76f01140 fixed edit folder move error message and style 2022-06-07 19:09:45 +02:00
Convly
986e87e2e9 Add comment for get plugin path 2022-06-07 18:51:32 +02:00
Convly
da3c2b2246 Fix unit tests 2022-06-07 18:15:37 +02:00
Convly
5247ed90d1 Update typings 2022-06-07 18:02:55 +02:00
Gustav Hansen
7501348524
Merge pull request #13490 from strapi/features/ML-folder-filters 
ML: Fix assets + folder filters
 2022-06-07 16:57:54 +01:00
Gustav Hansen
f7a5b866ea ML: Skip loading folders if an asset only filter is applied 2022-06-07 16:56:01 +01:00
ronronscelestes
0745dad06f fixed name value undefined when creating folder 2022-06-07 17:52:13 +02:00
Convly
6fe5a1e0cd Move createTSConfigFile method to ts utils package 2022-06-07 17:38:48 +02:00
ronronscelestes
964106d44a fixed focusing on edit folder button when leaving create folder 2022-06-07 17:34:07 +02:00
Convly
758c10fb6b Allow app.jsx for typescript projects 2022-06-07 17:33:20 +02:00
Gustav Hansen
873fcf879c MediaLibraryDialog: Fix displayed location after changes 2022-06-07 16:31:57 +01:00
Gustav Hansen
d613d6aa83
Merge pull request #13487 from strapi/features/ML-folder-card-height 
AssetList: Make all items equally height
 2022-06-07 16:04:47 +01:00
Gustav Hansen
3b08de5765
Merge pull request #13489 from strapi/features/ML-folder-edit-asset 
EditAssetDialog: Fix changing folder location
 2022-06-07 16:03:45 +01:00
Gustav Hansen
8dc5c8a90c useAssets/ useFolders: Add query merge tests 2022-06-07 15:42:29 +01:00
Convly
bdc043aaec Fix ctx.status 2022-06-07 16:19:24 +02:00
Convly
48ab30ccee First pass on Alexandre's review 2022-06-07 16:07:39 +02:00
Gustav Hansen
b34cc3cb5d ML: Fix assets + folder filters 2022-06-07 14:57:30 +01:00
Gustav Hansen
dc72d3c7e2 chore: Update snapshot tests 2022-06-07 14:48:15 +01:00
Gustav Hansen
4ea824d9ca AssetList: Make all items equally height 2022-06-07 14:46:36 +01:00
Gustav Hansen
05cb8e8da1 EditAssetDialog: Fix changing folder location 2022-06-07 14:29:44 +01:00
Mark Kaylor
9d40d0caa7 add tests for providers tab 2022-06-07 15:21:06 +02:00
Mark Kaylor
00f5dd39c6 add tests for plugins tab 2022-06-07 15:07:05 +02:00
Gustav Hansen
c6d7bef561
Merge pull request #13486 from strapi/features/ML-folder-prop-types 
ML: Fix various prop-types errors
 2022-06-07 14:06:10 +01:00
Gustav Hansen
28814db08e
Merge pull request #13485 from strapi/features/ML-folder-bulk-move-error 
BulkMoveButton: Move validation into BulkMoveDialog
 2022-06-07 14:05:57 +01:00
Mark Kaylor
e9288e20fd update snapshot 2022-06-07 14:11:57 +02:00
Gustav Hansen
813aca387c EditAssetDialog: Fix empty field value 2022-06-07 12:43:50 +01:00
Gustav Hansen
7ea93622fd ML: Relax prop-types for UploadingAssetCard and PendingAssetStep 2022-06-07 12:21:46 +01:00
Gustav Hansen
1e9c66a351 SelectTree: Improve Option prop-types 2022-06-07 12:19:17 +01:00
Gustav Hansen
275c896052 SelectTree: Fix .oneOfType() prop-type check 2022-06-07 12:02:32 +01:00
Gustav Hansen
1e284eb6cf ML: Fix various prop-types errors 2022-06-07 11:55:52 +01:00
Alexandre Bodin
73d54ef0ee Merge branch 'releases/4.2.0' into features/typescript 2022-06-07 12:24:41 +02:00
Alexandre Bodin
c12bde7e87 Merge branch 'master' into releases/4.2.0 2022-06-07 12:15:44 +02:00
Gustav Hansen
86e57e17f4
Merge pull request #13484 from strapi/dependabot/npm_and_yarn/qs-6.10.5 
Bump qs from 6.10.3 to 6.10.5
 2022-06-07 11:13:44 +01:00
Gustav Hansen
39f67d1d41 BulkMoveButton: Move validation into BulkMoveDialog 2022-06-07 10:39:04 +01:00
Convly
cb2702ef25 Take review into account 2022-06-07 11:34:21 +02:00
dependabot[bot]
f35de37649
Bump qs from 6.10.3 to 6.10.5 
Bumps [qs](https://github.com/ljharb/qs) from 6.10.3 to 6.10.5.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.10.3...v6.10.5)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-07 09:08:25 +00:00
Convly
f11c12ad57 Merge branch 'features/typescript' of github.com:strapi/strapi into typescript/types/schema 2022-06-07 11:07:12 +02:00
Gustav Hansen
ed07e75bf3
Merge pull request #13448 from strapi/ML-folder/lists-layouts 
[ML Folder] Lists layouts fixes
 2022-06-07 09:37:27 +01:00
Jean-Sébastien Herbaux
5caff35a30
Merge pull request #13440 from strapi/typescript/kitchensink-ts 
[TS] Update kitchensink-ts to the latest beta
v4.2.0-beta.4 		2022-06-07 09:56:42 +02:00
Convly
33bc24fb8e Merge branch 'features/typescript' into typescript/kitchensink-ts 2022-06-07 09:54:09 +02:00
Mark Kaylor
73bc7686a8 add label for tab group 2022-06-07 09:52:44 +02:00
Convly
7b89311c60 Merge branch 'typescript/types/schema' into typescript/schema-types-generation 2022-06-07 09:51:15 +02:00
Convly
d028d99f5c Merge branch 'features/typescript' into typescript/types/schema 2022-06-07 09:50:59 +02:00
Convly
3aa905608f Update snapshots 2022-06-07 09:50:41 +02:00
Mark Kaylor
1d46b0f9ef add translations 2022-06-07 09:50:26 +02:00
Convly
7a99759c1e Merge branch 'releases/4.2.0' of github.com:strapi/strapi into features/typescript 2022-06-07 09:49:55 +02:00
Mark Kaylor
29558b960f point providers to npm 2022-06-07 09:45:54 +02:00