yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-21 23:28:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 120 Branches 490 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simone Taeggi
c232a8e814 revert the empty lines 2022-08-03 12:00:16 +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
Alexandre BODIN
803e50d18b
Merge pull request #13956 from strapi/dependabot/npm_and_yarn/babel/parser-7.18.10 
Bump @babel/parser from 7.18.6 to 7.18.10
 2022-08-03 11:56:59 +02:00
Simone Taeggi
16338ad84b replace the ts webpack config file with the js version 2022-08-03 11:56:23 +02:00
Mark Kaylor
5db8fe1e4f Merge branch 'add-custom-field-attribute/injected-inputs' of github.com:strapi/strapi into add-custom-field-attribute/error-handling 2022-08-03 11:54:48 +02:00
Marc-Roig
06e0bde9c0 Merge branch 'master' into fix/app-crashes-on-upload-faulty-image 2022-08-03 11:53:44 +02:00
Alexandre Bodin
d8c72680a0 Update yarn lock 2022-08-03 11:52:34 +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
Alexandre Bodin
c8ef304b45 Merge branch 'master' into chore/graphql-use-graphql-scalars 2022-08-03 11:46:35 +02:00
Mark Kaylor
8eff28bf88 Use a dedicated section for injected inputs 2022-08-03 11:40:29 +02:00
Jean-Sébastien Herbaux
0f7d51a996
Merge pull request #13950 from strapi/fix/ts-get-config-path-invalid-return-type 
Fix invalid return for ts get-config-path
 2022-08-03 11:31:07 +02:00
Jean-Sébastien Herbaux
ec91e5943b
Merge pull request #13824 from strapi/api-token-v2/engine-abstraction 
Permission Engine Abstraction
 2022-08-03 11:19:26 +02:00
dependabot[bot]
1852eb40f1
Bump @babel/parser from 7.18.6 to 7.18.10 
Bumps [@babel/parser](https://github.com/babel/babel/tree/HEAD/packages/babel-parser) from 7.18.6 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-parser)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-03 09:11:02 +00: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
Simone Taeggi
807eabb356 revert to the original version because we want to use just javascript files for the webpack config 2022-08-03 10:28:35 +02:00
Convly
d8bd668fe5 Fix yarn.lock 2022-08-03 10:01:53 +02:00
Convly
a7eb9c81e6 Fix return type def 2022-08-03 09:51:45 +02:00
Convly
bf9c618a83 Fix invalid return for ts get-config-path 2022-08-03 09:50:27 +02:00
Jean-Sébastien Herbaux
a6c7c028ad
Merge pull request #13896 from strapi/api-token-v2/up-engine-impl 
Make users-permissions auth strategy use the content API permissions engine
 2022-08-03 09:46:13 +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
Mark Kaylor
05e9b74002 Check for valid type 2022-08-03 09:30:33 +02:00
Marc-Roig
fcbff9e5e7 handle image transformation error 2022-08-03 09:26:26 +02:00
Alexandre Bodin
fbc7e882f4 Apply feedback and finish some tasks 2022-08-02 20:58:37 +02:00
Alexandre Bodin
01e1a8f7ee Remove all doc 2022-08-02 20:23:42 +02:00
Alexandre Bodin
85b3e7de32 Merge branch 'master' into feature/user-permissions-change-password 2022-08-02 20:22:13 +02:00
Alexandre BODIN
7c15f23930
Merge pull request #13938 from strapi/dependabot/npm_and_yarn/babel/plugin-proposal-optional-chaining-7.18.9 
Bump @babel/plugin-proposal-optional-chaining from 7.16.7 to 7.18.9
 2022-08-02 20:14:44 +02:00
dependabot[bot]
c71f1715c8
Bump @babel/plugin-proposal-optional-chaining from 7.16.7 to 7.18.9 
Bumps [@babel/plugin-proposal-optional-chaining](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-optional-chaining) from 7.16.7 to 7.18.9.
- [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.9/packages/babel-plugin-proposal-optional-chaining)

---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-optional-chaining"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-02 16:21:12 +00:00
Alexandre BODIN
edce26b63f
Merge pull request #13939 from strapi/dependabot/npm_and_yarn/aws-sdk-2.1186.0 
Bump aws-sdk from 2.892.0 to 2.1186.0
 2022-08-02 18:17:51 +02:00
Alexandre BODIN
198cb4c9ec
Merge pull request #13923 from strapi/dependabot/npm_and_yarn/cloudinary-1.30.1 
Bump cloudinary from 1.29.0 to 1.30.1
 2022-08-02 18:17:22 +02:00
Alexandre BODIN
05f3471749
Merge pull request #13880 from strapi/dependabot/npm_and_yarn/graphql-tools/utils-8.9.0 
Bump @graphql-tools/utils from 8.6.6 to 8.9.0
 2022-08-02 18:16:41 +02:00
Alexandre BODIN
c282437dac
Merge pull request #13848 from strapi/dependabot/npm_and_yarn/babel/plugin-transform-modules-commonjs-7.18.6 
Bump @babel/plugin-transform-modules-commonjs from 7.16.7 to 7.18.6
 2022-08-02 18:16:09 +02:00
Jean-Sébastien Herbaux
f7a7098ef2
Merge pull request #13937 from strapi/fix/ts-false-positive-get-config-path 
Fix false positive results for ts utils' getConfigPath
 2022-08-02 17:56:48 +02:00
Mark Kaylor
46ff49f66e Merge branch 'add-custom-field-attribute/injected-inputs' of github.com:strapi/strapi into add-custom-field-attribute/error-handling 2022-08-02 17:51:05 +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
Convly
7d40f78384 Revert action/subject to action only 2022-08-02 16:51:06 +02:00
Ben Irvin
b077e735ba fix braces 2022-08-02 16:49:03 +02:00
Mark Kaylor
cf00410d5b Merge branch 'custom-fields/add-custom-field-attribute' of github.com:strapi/strapi into add-custom-field-attribute/injected-inputs 2022-08-02 16:25:09 +02:00
Mark Kaylor
b2cf7957ac Merge branch 'custom-fields/add-custom-field-attribute' of github.com:strapi/strapi into custom-fields/add-custom-field-attribute 2022-08-02 16:22:00 +02:00
Mark Kaylor
c894c071f3 Merge branch 'features/custom-fields' of github.com:strapi/strapi into custom-fields/add-custom-field-attribute 2022-08-02 16:18:31 +02:00
Mark Kaylor
ebe194db77 Handle errors when sending custom field from the admin to the server 2022-08-02 16:16:35 +02:00
Julie Plantey
0bcc4b17d2 Merge branch 'master' of https://github.com/strapi/strapi into features/folder-breadcrumbs 2022-08-02 15:59:27 +02:00