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

22792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ronronscelestes
78da4c84d6 renamed DialogTitle to DialogHeader + tests 2022-05-30 11:19:02 +02:00
Gustav Hansen
bf32846a12 Merge branch 'master' into features/ML-folder 2022-05-30 10:47:27 +02:00
ronronscelestes
1a9400564f back button and folder name for ML modal header 2022-05-30 10:34:50 +02:00
Gustav Hansen
6f6e1d3673
Merge pull request #13396 from strapi/dependabot/npm_and_yarn/vercel/ncc-0.34.0 
Bump @vercel/ncc from 0.33.3 to 0.34.0
 2022-05-30 08:53:56 +02:00
DanieleAurilio
98d6da1115 Allow also .ts ext in load-config-file.js 2022-05-29 23:19:45 +02:00
Daniele Aurilio
2b69d1d81c
Merge branch 'strapi:master' into releases/v4 2022-05-29 23:08:46 +02:00
Torgny Bjers
649b385f01
Merge remote-tracking branch 'upstream/master' into fix/CVE-2021-29418-mailgun-js-deprecated 2022-05-27 15:36:51 -04:00
Michael Nilsson
65cb147ec9 Fix generation of OpenAPI documentation with top level type attribute 2022-05-27 16:17:47 +02:00
ivanThePleasant
2cc5037e8a Moved console logs around to make code cleaner 2022-05-27 10:37:14 +03:00
Donovan Keme
90db0788f1
Update to focus on specific target directory 
Rather than any directory including the word `coverage`
 2022-05-26 14:23:10 -07:00
dependabot[bot]
283411114b
Bump @vercel/ncc from 0.33.3 to 0.34.0 
Bumps [@vercel/ncc](https://github.com/vercel/ncc) from 0.33.3 to 0.34.0.
- [Release notes](https://github.com/vercel/ncc/releases)
- [Commits](https://github.com/vercel/ncc/compare/0.33.3...0.34.0)

---
updated-dependencies:
- dependency-name: "@vercel/ncc"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-26 09:05:55 +00:00
derrickmehaffy
acb339e9cd add action 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2022-05-25 14:20:20 -07:00
Gustav Hansen
30b4c88dea chore: Update snapshot tests 2022-05-25 17:55:45 +02:00
Gustav Hansen
b9940cab05 ML: Add back useFolderStructure mock 2022-05-25 17:37:00 +02:00
Gustav Hansen
2dfb646994
Merge pull request #13391 from strapi/chore/gh-front-coverate 
Github: Fix coverage reports for front-end tests
 2022-05-25 17:26:57 +02:00
Alexandre Bodin
ab698015cf v4.1.12 v4.1.12 2022-05-25 17:17:49 +02:00
Gustav Hansen
2ca4fe74ed chore: Update tests 2022-05-25 16:58:29 +02:00
ronronscelestes
60a8ad3076 removed forwardRef + fixed cardTitle/subtitle style 2022-05-25 15:42:58 +02:00
ronronscelestes
aff13a0d60 feedback fix - number/select empty value checked in EditViewDataManagerProvider 2022-05-25 14:59:19 +02:00
Gustav Hansen
dca5551a31
Merge pull request #13390 from strapi/chore/ds-1-1-1 
chore: Update @strapi/design-system to 1.1.1
 2022-05-25 14:29:45 +02:00
Gustav Hansen
d9b357f1d0 chore: Update snapshot tests 2022-05-25 14:29:02 +02:00