yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-19 05:23:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,700 Commits 122 Branches 495 Tags
Commit Graph

28700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Gustav Hansen
159ee5abf6 chore: Update snapshot tests 2022-08-02 15:14:51 +02:00
Convly
d647d390ad Merge branch 'master' into chore/graphql-use-graphql-scalars 2022-08-02 14:54:10 +02:00
Gustav Hansen
eb374ad23a
Merge pull request #13799 from strapi/chore/bump-ds-1-2-1-beta-0 
chore: Bump @strapi/design-system to 1.2.1
 2022-08-02 14:17:56 +02:00
Gustav Hansen
e3fb4d5ae0 CTB: Improve SubNavSection title, by passing down defaultMessage 2022-08-02 13:43:30 +02:00
Gustav Hansen
f25f1b45b7
Merge branch 'master' into chore/bump-ds-1-2-1-beta-0 2022-08-02 13:20:54 +02:00
Gustav Hansen
3016533fd1 CTB: Update SubNav styles using improved DS properties 2022-08-02 13:12:49 +02:00
Ben Irvin
90bc708599 fix test name 2022-08-02 13:12:42 +02:00
Ben Irvin
f2def23f96 fix subject test 2022-08-02 13:07:42 +02:00
Ben Irvin
6e581e044b add type 2022-08-02 13:07:16 +02:00
Ben Irvin
640e0c859d add types 2022-08-02 12:57:41 +02:00
Pierre Noël
21d8cad4af
Merge pull request #13934 from strapi/fix/add-api-token-salt-in-created-projects 
Add apiToken.salt directly in the config of created projects
 2022-08-02 12:00:51 +02:00
Convly
2a60f6eb54 Move from deprecated packages to graphql-scalars to handle scalar types 2022-08-02 11:45:59 +02:00
Mark Kaylor
6a5f4a97b9 Inject inputs from plugins 2022-08-02 11:28:14 +02:00
markkaylor
dfe99b0f00
Merge pull request #13935 from strapi/add-custom-field-attribute/validation 
[Custom Field] Add validation
 2022-08-02 11:27:53 +02:00
Bassel Kanso
fca84ede09 Merge branch 'master' into fix/counting-when-deep-filtering 2022-08-02 12:14:45 +03:00