yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-04 06:49:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,587 Commits 109 Branches 487 Tags
Commit Graph

5123 Commits

Author SHA1 Message Date
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
Convly
5c7576db65 Fix update & create 2022-08-05 12:31:16 +02:00
Convly
3a9709bdbf Attach permission model to tokens, update api token' strategy & services 2022-08-05 12:01:36 +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
Bassel Kanso
701aa19911 update permission engine pakage version 2022-08-05 10:25:07 +03:00
Bassel Kanso
52c0a74418 Merge branch 'master' into features/api-token-v2 2022-08-05 09:55:17 +03: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
Marc-Roig
aa588b4629 update corrupt image test 2022-08-04 16:07:12 +02:00
Gustav Hansen
838dcc5a01 EmptyOrNoPermissions: simplify getContent() 2022-08-04 15:36:15 +02:00
Gustav Hansen
3c6a58aaea ML: Remove default NoPermissions component 2022-08-04 15:17:56 +02:00
Julie Plantey
324b1628f6 fixed translations 2022-08-04 15:15:55 +02:00
Julie Plantey
c59cced54b Merge branch 'master' of https://github.com/strapi/strapi into features/folder-breadcrumbs 2022-08-04 14:58:59 +02:00
Gustav Hansen
11d021507c ML: Improve canRead and canCreate permission messages 2022-08-04 14:00:23 +02:00
Bassel Kanso
94b1ae4c70 Merge branch 'master' into features/api-token-v2 2022-08-04 14:11:28 +03:00
Marc-Roig
d8c218a089 change writableDiscardStream name 2022-08-04 13:05:25 +02:00
Marc-Roig
39102d185e change writableDiscardStream name 2022-08-04 12:58:47 +02:00
Marc-Roig
d61104de72 check if image is faulty in enhanceFile 2022-08-04 12:56:58 +02:00
Gustav Hansen
71f290f4c1 Upload: Handle file upload errors gracefully 2022-08-04 12:06:17 +02:00
Pierre Noël
1f41b4ba48 Fix upload of menu logo 2022-08-04 09:57:26 +02:00
Marc-Roig
096dba7983 expect Application Error in test 2022-08-04 09:37:38 +02:00
Marc-Roig
5b0bcab7b1 move try catch to image manipulation 2022-08-03 20:39:44 +02:00
Bassel Kanso
9619cf69a3 only use countDistinct when needed 2022-08-03 14:46:07 +03:00
Marc-Roig
ff932b1cb3 remove image 2022-08-03 12:49:34 +02:00
Marc-Roig
38bd435f2f test corrupt image upload 2022-08-03 12:48:12 +02:00
Alexandre BODIN
ffaff7c66a
Merge pull request #13655 from lkho/pr/database-schema-diff-columns 
fix: diff indexes columns
 2022-08-03 12:33:51 +02:00
Alexandre Bodin
655615b738 Upgrade babel 2022-08-03 12:09:08 +02:00
Bassel Kanso
2b576869b6 only use id when state.count is * 2022-08-03 12:59:30 +03:00
Alexandre BODIN
f2002891c4
Merge pull request #13952 from strapi/dependabot/npm_and_yarn/babel/plugin-transform-runtime-7.18.10 
Bump @babel/plugin-transform-runtime from 7.16.7 to 7.18.10
 2022-08-03 11:58:45 +02:00
Marc-Roig
06e0bde9c0 Merge branch 'master' into fix/app-crashes-on-upload-faulty-image 2022-08-03 11:53:44 +02:00
Marc
e73aaf6e9e
Merge pull request #13930 from strapi/fix/manually-resize-image-on-upload 
Do not override width and height after uploading image
 2022-08-03 11:51:58 +02:00
dependabot[bot]
202eb2350b
Bump @babel/plugin-transform-runtime from 7.16.7 to 7.18.10 
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.16.7 to 7.18.10.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.18.10/packages/babel-plugin-transform-runtime)

---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-runtime"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-03 09:04:11 +00:00
Jean-Sébastien Herbaux
1b43162031
Update packages/core/permissions/README.md 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2022-08-03 10:48:42 +02:00
Jean-Sébastien Herbaux
b082944039
Update packages/core/permissions/README.md 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2022-08-03 10:48:31 +02:00
bashar
af7c190b95 add badgeContent to pluginsSectionsLinks 2022-08-03 10:43:18 +03:00
Marc-Roig
237d12abf4 typos 2022-08-03 09:39:52 +02:00
Marc-Roig
840fc194c8 remove comment 2022-08-03 09:33:47 +02:00
Marc-Roig
fcbff9e5e7 handle image transformation error 2022-08-03 09:26:26 +02:00
Convly
787a90de69 Fix typings 2022-08-02 17:43:40 +02:00
Convly
53f642f2ed Fix tests 2022-08-02 17:42:38 +02:00
Convly
c473d84128 Merge branch 'api-token-v2/engine-abstraction' into api-token-v2/up-engine-impl 2022-08-02 16:59:37 +02:00
Gustav Hansen
5ef019318c
Merge pull request #13943 from strapi/enhancement/subnav-ds-update 
CTB: Update SubNav styles using improved DS properties
 2022-08-02 16:53:32 +02:00
Ben Irvin
8fd063ae57
Merge pull request #13942 from strapi/api-token-v2/engine-abstraction-tests 
Api token v2/engine abstraction tests
 2022-08-02 16:53:08 +02:00