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
Alexandre Bodin
9c81bcaacb Fix username vs email registration and login issues 2022-05-31 19:38:08 +02:00
ronronscelestes
248e657377 refacto FolderList, MediaLibrary use of FolderList 2022-05-31 19:28:42 +02:00
Pierre Noël
a9f53dc53b
Merge pull request #13350 from strapi/ML-folder/transactions 
Ml folder/transactions
 2022-05-31 18:58:22 +02:00
ronronscelestes
cba1adcea4 fixed css syntax 2022-05-31 17:14:37 +02:00
ronronscelestes
76def44903 fix css syntax 2022-05-31 17:13:45 +02:00
ronronscelestes
43c02a0572 Merge branch 'features/ML-folder' of https://github.com/strapi/strapi into ML-folder/folder-card-refactor 2022-05-31 17:06:34 +02:00
Convly
d86156aea1 Update kitchensink-ts to the latest beta 2022-05-31 16:40:09 +02:00
ronronscelestes
3a50bdb934 added comment to explain the 80px 2022-05-31 16:38:44 +02:00
ronronscelestes
2aecd5e294 replaced px by rem for LoadingBody 2022-05-31 16:37:41 +02:00
ronronscelestes
aacc15d07f replaced 80px with rem for LoadingBody 2022-05-31 16:32:20 +02:00
ronronscelestes
6532903b42 fixed folderStructure needed in EditAssetDialog 2022-05-31 16:28:28 +02:00
Alexandre BODIN
c006f74a4e
Merge pull request #13331 from strapi/fix/deep-populate-components 
Remove limit on deep populate on components
 2022-05-31 15:57:55 +02:00
Convly
004024b58f Merge branch 'features/typescript' into typescript/types/schema 2022-05-31 15:29:49 +02:00
Convly
da364912ee Merge branch 'master' of github.com:strapi/strapi into features/typescript 2022-05-31 15:29:18 +02:00
ronronscelestes
f4c9bc018b fixed some tests and empty search translations 2022-05-31 15:27:14 +02:00
ronronscelestes
8d086fa36c Merge branch 'features/ML-folder' of https://github.com/strapi/strapi into ML-folder/modal-header 2022-05-31 14:21:44 +02:00
ronronscelestes
e7af8bdd26 search on folder and UI enhancements 2022-05-31 14:21:05 +02:00
Alexandre BODIN
4abd4fefc9
Merge pull request #13113 from NoAra-Tech/fix/add-missing-key-script-argv-check 
Prevent `argv` check on "add-missing-keys-to-other-language"
 2022-05-31 14:08:08 +02:00
Alexandre Bodin
4f02ba6b74 wip 2022-05-31 14:06:58 +02:00
Gustav Hansen
5f6d3779fa
Merge pull request #13423 from strapi/features/ML-folder-bulk-move 
ML: Add bulk move hook
 2022-05-31 13:44:24 +02:00
Gustav Hansen
66ac83b25a ML: Make bulk actions prop-types more strict 2022-05-31 13:02:36 +02:00
Gustav Hansen
e3a46d10ab ML: Implement bulk-move UI 2022-05-31 12:59:06 +02:00
Gustav Hansen
ae99437038 ML: Add bulk move hook 2022-05-31 12:24:00 +02:00
Gustav Hansen
a9fd717bf5
Merge pull request #13102 from strapi/features/ML-folder-useModalQueryParams 
ML: Split AssetDialog into folders and assets
 2022-05-31 12:01:41 +02:00
Convly
ee211466ce Remove 4.7 based features, added some comments 2022-05-31 10:08:12 +02:00
Jean-Sébastien Herbaux
a7975146ba
Merge pull request #13376 from strapi/chore/update-node-support 
Chore/update node support
 2022-05-31 09:50:10 +02:00
Gustav Hansen
e6d076f686 chore: Update tests 2022-05-31 09:08:02 +02:00
Duc Tran
34123b7e97
Update vi.json 2022-05-31 03:11:03 +07:00
Duc Tran
9985ff6624
Update vi.json 
Fix some typo in Vietnamese
 2022-05-31 02:35:58 +07:00
Alexandre BODIN
6ebed3c1a0
Merge pull request #12966 from tbjers/fix/CVE-2021-29418-mailgun-js-deprecated 
fix: change from mailgun-js to mailgun.js
 2022-05-30 21:31:39 +02:00
Torgny Bjers
720f842f38
remove superfluous Promise wrapper 2022-05-30 12:49:10 -04:00
Torgny Bjers
4366b70b4f
Merge branch 'master' into fix/CVE-2021-29418-mailgun-js-deprecated 2022-05-30 11:53:56 -04:00
ronronscelestes
9ce381bd7b feedback fixes 2022-05-30 17:47:25 +02:00
Alexandre BODIN
a280b3652f
Merge pull request #13394 from strapi/support/addToProject 
Automatically add new github issues to support project
 2022-05-30 17:28:39 +02:00
ronronscelestes
40452ace5e Merge branch 'features/ML-folder-useModalQueryParams' of https://github.com/strapi/strapi into ML-folder/modal-header 2022-05-30 17:24:54 +02:00
Convly
b385b3dc89 Merge branch 'releases/4.2.0' of github.com:strapi/strapi into chore/update-node-support 2022-05-30 16:50:57 +02:00
derrickmehaffy
80090e4d12 Update var name 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2022-05-30 07:05:25 -07:00
Gustav Hansen
37561b2d3e Merge branch 'features/ML-folder' into features/ML-folder-useModalQueryParams 2022-05-30 15:53:34 +02:00
Gustav Hansen
ae7ef3a7a0
Merge pull request #13415 from strapi/features/ML-folder-yarn 
ML: Update yarn lockfile with latest changes from master
 2022-05-30 15:52:21 +02:00
ronronscelestes
21728fac76 Merge branch 'features/ML-folder-useModalQueryParams' of https://github.com/strapi/strapi into ML-folder/modal-header 2022-05-30 15:11:50 +02:00
Convly
e62efa2a6a Type => AttributeType 2022-05-30 14:44:06 +02:00
Alexandre BODIN
a50f6e10bc
Merge pull request #13361 from digitalextremist/patch-1 
Update .gitignore to allow use of word "coverage"
 2022-05-30 14:37:33 +02:00
Convly
12b125d2df Add generic typings for schemas & attributes 2022-05-30 14:34:09 +02:00
Gustav Hansen
07fb39933b ML: Update yarn lockfile with latest changes from master 2022-05-30 14:09:55 +02:00
Gustav Hansen
9b7c0ca077 BrowseStep: Take search into account of the empty state component 2022-05-30 13:27:40 +02:00
Michal
a8ad07fb04 pl-translation 2022-05-30 13:23:12 +02:00
Gustav Hansen
895188e994 Merge branch 'features/ML-folder' into features/ML-folder-useModalQueryParams 2022-05-30 12:57:44 +02:00
ronronscelestes
156c801a1f fixed loading modal height 2022-05-30 12:01:29 +02:00
Alexandre BODIN
e52036125a
Merge pull request #13404 from micnil/bugfix/13373-plugin-documentation-component-response-type 
Fix generation of OpenAPI documentation with top level type attribute
 2022-05-30 11:34:07 +02:00
ronronscelestes
5d4435590f added translation for folder name and back button 2022-05-30 11:29:06 +02:00