yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-05 23:40:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,792 Commits 112 Branches 487 Tags
Commit Graph

22792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
杨飞
4606ffeb90 feat(translations): add several items in zh-Hans 2022-06-15 13:43:55 +08:00
ronronscelestes
35314df61d allowing search on all level 2022-06-14 18:33:49 +01:00
ronronscelestes
74349facd8 changed position of SelectTree popover when overflowing 2022-06-14 17:25:50 +01:00
ronronscelestes
592ae7c10a fixed folder count + format info edit folder 2022-06-14 17:07:30 +01:00
markkaylor
e75fbef7f0
Merge pull request #13546 from strapi/providers/submit-provider-button 
[Marketplace] Add submit providers button
 2022-06-14 17:23:50 +02:00
Julie Plantey
cd5341386e
Merge pull request #13549 from strapi/features/ML-folder-bulk-move-update 
useBulkMove: Always re-fetch folders after a move action
 2022-06-14 16:56:16 +02:00
Pierre Noël
e5a87523bd add unit test 2022-06-14 15:54:45 +01:00
Julie Plantey
07bc405c06
Merge pull request #13442 from kiri-rin/PR/karakalpak-locale 
kara-kalpak locale
 2022-06-14 16:11:42 +02:00
Gustav Hansen
21b5ef6d7b
Merge pull request #13494 from strapi/ML-folder/edit-move-error 
[ML Folder] Edit move error fixes
 2022-06-14 16:00:40 +02:00
Mark Kaylor
6ebc596603 update translation 2022-06-14 15:40:40 +02:00
Mark Kaylor
db343dc78c remove your from cta 2022-06-14 15:39:24 +02:00
meherchandan
e00b8f048d fix: postgres timeout error due to complex join queries to fect foreign key references 2022-06-14 17:17:53 +04:00
Gustav Hansen
9b271b7c7b
Merge pull request #13540 from strapi/ML-folder/AssetDialog-header-enh 
[ML Folder] AssetDialog header improvements
 2022-06-14 14:45:42 +02:00
Gustav Hansen
7e1bbc099c useBulkMove: Always re-fetch folders after a move action 2022-06-14 14:29:46 +02:00
Gustav Hansen
35739d2170 chore: Update snapshot tests 2022-06-14 14:22:01 +02:00
Gustav Hansen
bf212b6e0c ML: Refactor view & header to make use of useFolder 2022-06-14 14:21:41 +02:00
Gustav Hansen
a5c332f282 ML: Add useFolder hook 2022-06-14 14:21:17 +02:00
Mark Kaylor
54d5f9d0ae add tests 2022-06-14 14:15:58 +02:00
ronronscelestes
e80992c3a0 added focus style for back button+icon 2022-06-14 11:58:18 +01:00