yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-25 17:19:46 +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
Convly
7e472bb908 Update frontend snapshots 2022-06-17 19:04:37 +02:00
Convly
6c9b500586 Update generator. Use typescript compiler API to generate definitions 2022-06-17 19:00:27 +02:00
tiagolima90
ce278635a9
Merge branch 'strapi:master' into master 2022-06-17 10:54:44 +00:00
Pierre Noël
0039c33952 add deprecation message 2022-06-16 19:49:30 +01:00
Pierre Noël
0fbcd89ec8 add e2e test to check image dimensions are populated 2022-06-16 19:37:18 +01:00
Gustav Hansen
298a717888 SelectTree: Fix collapsing/ expanding options with proper order 2022-06-16 20:27:01 +02:00
Pierre Noël
c69ac511f4 Save dimensions for svg and gif images 2022-06-16 17:56:12 +01:00
Convly
44d216a028 Merge branch 'typescript/types/schema' into typescript/schema-types-generation 2022-06-16 18:03:35 +02:00
Convly
584d530ec5 Merge branch 'features/typescript' into typescript/types/schema 2022-06-16 18:01:26 +02:00
Convly
6f01b3dbaa Merge branch 'master' of github.com:strapi/strapi into features/typescript 2022-06-16 18:01:02 +02:00
Convly
e4a05b3b1a Extend the nodejs global interface & add the strapi global variable to it 2022-06-16 17:54:11 +02:00
Convly
034e39083e Update attributes types definitions, make them more composable 2022-06-16 17:53:41 +02:00
Pierre Noël
02768b6fff
Merge pull request #13370 from cortopy/upload-plugin-replace-media-await 
add missing await in upload plugin
 2022-06-16 16:45:26 +01:00
meherchandan
f6dca134e9 fix: added new eqsi operator for case insensitive equal search 2022-06-16 16:27:19 +04:00
meherchandan
584ed889c6 Merge remote-tracking branch 'upstream/master' 2022-06-16 16:16:43 +04:00
Convly
38e29b7110 fix style 2022-06-16 13:00:41 +02:00
Noeemi
512082fc09 fix(content-type-builder/attribute-option): align text to the left 2022-06-16 12:22:59 +02:00
Klaudia
fc385940a4
Merge branch 'master' into update-pl-translation 2022-06-16 11:51:30 +02:00
Noeemi
4b08395b47 feat(translations): update and add missing PL translations 2022-06-16 11:27:07 +02:00
Convly
34bb591cea Enable filtering on nested components 2022-06-16 10:21:03 +02:00
Anjali MahawR
73795d13b0 tests updated successfully in languageNativeNames.js 2022-06-16 00:20:33 -04:00
ronronscelestes
e4b9249576 updated branch and fixed snapshots 2022-06-15 19:37:13 +01:00
ronronscelestes
459e04f99b Merge branch 'master' of https://github.com/strapi/strapi into fix/authenticated-app-tests 2022-06-15 19:21:00 +01:00
ronronscelestes
21ab4ebd5b improve readbility in useAssets/useFolders 2022-06-15 17:59:20 +01:00
Gustav Hansen
419d44b117
Merge pull request #13548 from strapi/features/ML-folder-404 
ML: Redirect to root, if a folder throws 404
 2022-06-15 18:08:43 +02:00
Gustav Hansen
593566e7c2
Merge pull request #13564 from strapi/features/ML-folder-icon-size 
FolderCard: Increase icon size
 2022-06-15 18:08:04 +02:00
Gustav Hansen
f65882862d
Merge pull request #13565 from strapi/features/ML-folder-select-disabled 
EditAssetDialog: Disable location select field conditionally
 2022-06-15 18:07:46 +02:00
Pierre Burgy
632672a95c
Merge pull request #13567 from strapi/releases/4.2.0 
Releases/4.2.0
 2022-06-15 18:04:45 +02:00
Jean-Sébastien Herbaux
c5ffea6ff2
Merge pull request #13566 from strapi/4.2.0 
4.2.0
 2022-06-15 15:17:49 +02:00
Convly
642b6a37e0 4.2.0 2022-06-15 15:09:07 +02:00
Gustav Hansen
24d7a9bf5e BulkMoveDialog: Add loading state 2022-06-15 15:01:42 +02:00
Gustav Hansen
a3275b4dc9 EditAssetDialog: Disable location select field conditionally 2022-06-15 14:41:30 +02:00
Gustav Hansen
3da1ba1ceb chore: Update snapshot tests 2022-06-15 14:36:28 +02:00
Gustav Hansen
689bd6c432 FolderCard: Increase icon size 2022-06-15 14:34:28 +02:00
Gustav Hansen
fec5e68074
Merge pull request #13562 from strapi/dependabot/npm_and_yarn/eslint-plugin-react-hooks-4.6.0 
Bump eslint-plugin-react-hooks from 4.5.0 to 4.6.0
 2022-06-15 14:02:58 +02:00
Gustav Hansen
097aebbb82
Merge pull request #13563 from strapi/features/ML-folder-alignment 
FolderCard: Improve alignments
 2022-06-15 14:02:26 +02:00
Gustav Hansen
367e9bf513 chore: Update snapshot tests 2022-06-15 13:59:54 +02:00
Gustav Hansen
9a38445f37 FolderCard: Improve alignments 2022-06-15 13:57:23 +02:00
Gustav Hansen
fc7865f8ee ML: Take permissions into account before fetching a single folder 2022-06-15 13:34:18 +02:00
Gustav Hansen
5659b5f031 chore: Update snapshot tests 2022-06-15 13:31:31 +02:00
Gustav Hansen
efad0452d6 ML: Update header test 2022-06-15 13:31:09 +02:00
Gustav Hansen
4597591f08 ML: Pass down assetCount and folderCount to Header 2022-06-15 13:26:07 +02:00
Gustav Hansen
40046aa823 useFolder: Improve error message 2022-06-15 13:25:49 +02:00
dependabot[bot]
3ac38aa733
Bump eslint-plugin-react-hooks from 4.5.0 to 4.6.0 
Bumps [eslint-plugin-react-hooks](https://github.com/facebook/react/tree/HEAD/packages/eslint-plugin-react-hooks) from 4.5.0 to 4.6.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/HEAD/packages/eslint-plugin-react-hooks)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-15 09:06:28 +00:00
Jean-Sébastien Herbaux
2cc62a0756
Merge pull request #13561 from strapi/master 
Update 4.2.0 with master
 2022-06-15 10:35:56 +02:00
Jean-Sébastien Herbaux
aeb21ff85e
Merge pull request #13105 from jorgeRambla/fix/upload-plugin 
Fix upload plugin
 2022-06-15 09:45:42 +02:00
markkaylor
b21bfb0e8d
Merge pull request #13543 from strapi/features/providers 
[Marketplace] Add providers to marketplace
 2022-06-15 09:36:52 +02:00
Gustav Hansen
3384aaa891
Merge pull request #13553 from strapi/ML-folder/select-tree-overflow 
[ML Folder] Fixed SelectTree overflowing
 2022-06-15 09:27:13 +02:00
Gustav Hansen
437e06416f
Merge pull request #13551 from strapi/ML-folder/folder-count-edit 
[ML Folder] Fix count info in EditFolderDialog
 2022-06-15 09:26:28 +02:00
Gustav Hansen
692a7f0c47
Merge pull request #13544 from strapi/ML-folder/allow-query-params-get-folder 
Allow the query params for GET folder
 2022-06-15 09:18:59 +02:00