yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-12 07:27:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,428 Commits 139 Branches 513 Tags
Commit Graph

4930 Commits

Author SHA1 Message Date
Pierre Noël
310833b9c8
Merge pull request #13964 from strapi/fix/logo-customization 
Fix upload of menu logo
 2022-08-09 18:41:35 +02:00
Marc-Roig
7bf2612a15 use last element of path as filename 2022-08-09 18:14:15 +02:00
Julie Plantey
2f0259c0c6 passing parentFolderId to AssetDialog 2022-08-09 18:14:13 +02:00
Pierre Noël
8758904883
Merge pull request #14003 from WalkingPizza/fix/webhook-triggering 
Add missing permissions to webhook triggering endpoint
 2022-08-09 18:11:59 +02:00
Marc-Roig
9e67d3b706 remove webhook comment 2022-08-09 18:11:03 +02:00
Pierre Noël
b307069465 Populate folder for media for findOne in CM 2022-08-09 17:53:47 +02:00
Marc-Roig
59b39b47b7 comments 2022-08-09 17:46:57 +02:00
Marc-Roig
62bd2b1708 trigger webhook on bulk delete 2022-08-09 17:44:57 +02:00
WalkingPizza
b43a35aaf7 Replace trigger permission with update 2022-08-09 17:20:19 +02:00
Marc-Roig
305dc187be removing components before deleting entity 2022-08-09 17:15:40 +02:00
Bassel Kanso
0f451ca49e Merge branch 'master' into fix/counting-when-deep-filtering 2022-08-09 17:11:01 +03:00
Bassel Kanso
de06888375 imporve deepFiltering e2e test 2022-08-09 17:10:54 +03:00
Gustav Hansen
cf44ba82aa
Revert "add badgeContent to pluginsSectionsLinks" 2022-08-09 15:44:35 +02:00
Pierre Noël
c115e268cb update test 2022-08-09 12:26:54 +02:00
Pierre Noël
6168d38617 ignore if populating a scalar attribute 2022-08-09 12:19:58 +02:00
Marc-Roig
10ea1e4ea2 refactor clean url 2022-08-09 11:43:54 +02:00
ivanThePleasant
7291d2e6cf Change user hashing to be a service on admin, introduce adminUserId property to the send function, refactor several events 2022-08-09 12:20:25 +03:00
Gustav Hansen
4ea0a3ddd3
Merge pull request #13951 from BasharOsman/master 
add badgeContent to pluginsSectionsLinks
 2022-08-09 11:14:54 +02:00
Bassel Kanso
cdd8be759c Merge branch 'master' into fix/counting-when-deep-filtering 2022-08-09 10:46:50 +03:00
Bassel Kanso
f92ff683ea make 'id' default value for count 2022-08-09 10:45:58 +03:00
Pierre Noël
e6d7714a86
Merge pull request #14002 from WalkingPizza/fix/13999 
Generate fileInfo for every file when uploading in bulk
 2022-08-08 18:38:18 +02:00
Julie Plantey
d340089352
Merge pull request #13846 from smoothdvd/localization-attribute-filter 
update: localized attribute filter
 2022-08-08 18:04:49 +02:00
WalkingPizza
36525d1a26 Add E2E tests with fileInfo 2022-08-08 17:45:21 +02:00
WalkingPizza
483a260c0d Add E2E tests 2022-08-08 16:01:34 +02:00
WalkingPizza
544b1258dd Properly flag that upload has multiple files 2022-08-08 15:26:09 +02:00
WalkingPizza
4e1d735803 Generate a fileInfo array on when necessary 2022-08-08 15:08:26 +02:00
WalkingPizza
073e6cc3be Generate fileInfo for every file when uploading in bulk 2022-08-08 15:00:12 +02:00
Marc-Roig
fce7a9112a change cleanURL description 2022-08-08 14:10:08 +02:00
Marc-Roig
08cb683bd1 clean url when uploading media from url 2022-08-08 14:06:30 +02:00
smoothdvd
e65ffdd977
add default message 2022-08-08 19:49:44 +08:00
Gustav Hansen
25265415a6
Merge pull request #14007 from strapi/dependabot/npm_and_yarn/storybook/react-6.5.10 
Bump @storybook/react from 6.5.9 to 6.5.10
 2022-08-08 13:24:22 +02:00
Alexandre BODIN
4a13abba2d
Merge pull request #13991 from strapi/dependabot/npm_and_yarn/ci-info-3.3.2 
Bump ci-info from 3.1.1 to 3.3.2
 2022-08-08 12:09:33 +02:00
dependabot[bot]
a3b8324af9
Bump @storybook/react from 6.5.9 to 6.5.10 
Bumps [@storybook/react](https://github.com/storybookjs/storybook/tree/HEAD/app/react) from 6.5.9 to 6.5.10.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.10/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.10/app/react)

---
updated-dependencies:
- dependency-name: "@storybook/react"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-08 09:06:34 +00:00
Marc-Roig
5a90357622 get extension from mime type if not available 2022-08-08 10:38:42 +02:00
Marc-Roig
4de86c4927 get extension from filename when bin 2022-08-08 09:37:37 +02:00
Marc-Roig
41dae37e1f get extension from file name 2022-08-08 09:33:01 +02:00
Marc
0d4bdea37b
Merge pull request #13949 from strapi/fix/app-crashes-on-upload-faulty-image 
Fix: app crashes on upload corrupt image
 2022-08-08 09:26:40 +02:00
WalkingPizza
e0350558bc Add missing permissions to webhook triggering endpoint 2022-08-06 15:19:20 +02:00
Marc-Roig
97c695f597 add prefix to extension 2022-08-05 16:53:41 +02:00
Marc-Roig
de8ffeaa7b extract file type from mime type if possible 2022-08-05 15:50:27 +02:00
Gustav Hansen
09757686b0
Merge pull request #13993 from strapi/fix/cellcontent-decimals 
CellContent: Relax number formatting
 2022-08-05 14:17:45 +02:00
Julie Plantey
c0398521e0
Merge pull request #13917 from strapi/features/folder-breadcrumbs 
[Features] Breadcrumbs Folders navigation
 2022-08-05 12:55:53 +02:00
Gustav Hansen
ce7174120d CellContent: Relax number formatting 2022-08-05 11:56:16 +02:00
dependabot[bot]
235ae954ae
Bump ci-info from 3.1.1 to 3.3.2 
Bumps [ci-info](https://github.com/watson/ci-info) from 3.1.1 to 3.3.2.
- [Release notes](https://github.com/watson/ci-info/releases)
- [Changelog](https://github.com/watson/ci-info/blob/master/CHANGELOG.md)
- [Commits](https://github.com/watson/ci-info/compare/v3.1.1...v3.3.2)

---
updated-dependencies:
- dependency-name: ci-info
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-05 09:06:40 +00:00
dependabot[bot]
0aedf74b87
Bump @storybook/addon-actions from 6.4.10 to 6.5.10 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 6.4.10 to 6.5.10.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.10/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.10/addons/actions)

---
updated-dependencies:
- dependency-name: "@storybook/addon-actions"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-05 09:05:45 +00:00
Julie Plantey
7d31f2282c Merge branch 'master' of https://github.com/strapi/strapi into features/folder-breadcrumbs 2022-08-04 18:34:14 +02:00
Gustav Hansen
d73b847c5c
Merge pull request #13978 from strapi/fix/ml-permissions-view 
ML: Improve canRead and canCreate permission messages
 2022-08-04 17:41:42 +02:00
Marc-Roig
d266c41c01 remove faulty image tests 2022-08-04 17:35:44 +02:00
Marc-Roig
03c8ba6bba fix optimization file 2022-08-04 17:16:43 +02:00
Julie Plantey
ffde4d4b58 hide breadcrumbs if in root of ML + added tests 2022-08-04 16:25:50 +02:00