yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-21 15:19:22 +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
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
Gustav Hansen
de9d79694f
Merge pull request #14008 from strapi/dependabot/npm_and_yarn/testing-library/jest-dom-5.16.5 
Bump @testing-library/jest-dom from 5.16.4 to 5.16.5
 2022-08-08 13:23:45 +02:00
Gustav Hansen
9186f0fc75
Merge pull request #14010 from strapi/dependabot/npm_and_yarn/swc/core-1.2.224 
Bump @swc/core from 1.2.218 to 1.2.224
 2022-08-08 13:23:08 +02:00
Gustav Hansen
78c8651e1e Merge branch 'master' into feature/relations-main-view 2022-08-08 12:46:31 +02:00
dependabot[bot]
9cd8ff92c5
Bump @swc/core from 1.2.218 to 1.2.224 
Bumps [@swc/core](https://github.com/swc-project/swc) from 1.2.218 to 1.2.224.
- [Release notes](https://github.com/swc-project/swc/releases)
- [Changelog](https://github.com/swc-project/swc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/swc-project/swc/compare/v1.2.218...v1.2.224)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-08 10:20:30 +00:00
Alexandre Bodin
7b330a3648 Remove admin-development example for the time being 2022-08-08 12:12:24 +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
Alexandre BODIN
99603ffb8c
Merge pull request #14006 from strapi/dependabot/npm_and_yarn/docs/terser-5.14.2 
Bump terser from 5.14.1 to 5.14.2 in /docs
 2022-08-08 12:07:57 +02:00
dependabot[bot]
bbdd78ff43
Bump @testing-library/jest-dom from 5.16.4 to 5.16.5 
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 5.16.4 to 5.16.5.
- [Release notes](https://github.com/testing-library/jest-dom/releases)
- [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.16.4...v5.16.5)

---
updated-dependencies:
- dependency-name: "@testing-library/jest-dom"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-08 10:06:17 +00:00
Alexandre BODIN
e5d6a94bd1
Merge pull request #13967 from strapi/dependabot/npm_and_yarn/mailgun.js-5.2.2 
Bump mailgun.js from 5.0.2 to 5.2.2
 2022-08-08 12:04:57 +02:00
markkaylor
9211b8643b
Merge pull request #13940 from strapi/add-custom-field-attribute/injected-inputs 
[Custom Fields] Inject inputs from plugins
 2022-08-08 11:15:44 +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
dependabot[bot]
730d616d30
Bump terser from 5.14.1 to 5.14.2 in /docs 
Bumps [terser](https://github.com/terser/terser) from 5.14.1 to 5.14.2.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/compare/v5.14.1...v5.14.2)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-08 08:50:49 +00:00
Alexandre BODIN
416396c00e
Merge pull request #13710 from strapi/chore/init-docu 
Init tech docs
 2022-08-08 10:50:11 +02:00
Marc-Roig
5a90357622 get extension from mime type if not available 2022-08-08 10:38:42 +02:00
Mark Kaylor
4c9cc4a846 Add edit custom field action 2022-08-08 10:34:53 +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
Alexandre BODIN
6c68176efc
Merge pull request #12890 from WalkingPizza/feature/user-permissions-change-password 
Allow users to change own password
 2022-08-05 21:57:48 +02:00
Pierre Noël
5f9c19770f
Merge pull request #13979 from strapi/relations-main-view/configuration-migrate-editRelations 
Relations main view/configuration migrate edit relations
 2022-08-05 20:13:38 +02:00
Jean-Sébastien Herbaux
9dd14b39b7
Merge pull request #13941 from strapi/chore/graphql-use-graphql-scalars 
Move from deprecated packages to graphql-scalars to handle scalar types
 2022-08-05 17:28:52 +02:00
Pierre Noël
3bb7a08fa1 fix e2e tests 2022-08-05 16:59:52 +02:00
Pierre Noël
176acfef4c remove editRelations from configuration routes 2022-08-05 16:59:52 +02:00
Pierre Noël
db1bf34f2a migrate editRelations to edit during configurationSync 2022-08-05 16:59:52 +02:00
Bassel Kanso
e4e550be88 update snapshot tests 2022-08-05 17:55:38 +03:00
Marc-Roig
97c695f597 add prefix to extension 2022-08-05 16:53:41 +02:00
Bassel Kanso
3d21233bc3 Merge branch 'features/api-token-v2' into api-token-v2/rbac-on-api-token-creation 2022-08-05 17:41:38 +03:00
Bassel Kanso
51cb6ffeac fix linting error 2022-08-05 17:41:10 +03:00
Convly
5bf7c58872 Merge branch 'master' into chore/graphql-use-graphql-scalars 2022-08-05 16:33:23 +02:00
Bassel Kanso
b57cee52ac make user able to see token details if they have read permissions 2022-08-05 17:00:47 +03:00
Marc-Roig
de8ffeaa7b extract file type from mime type if possible 2022-08-05 15:50:27 +02:00
Gustav Hansen
68fa694345
Merge pull request #13982 from strapi/feature/relations-main-view-cm-cleanup-editrelations 
CM: Remove editrelations from useFetchContentTypeLayout
 2022-08-05 15:04:11 +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
Mark Kaylor
f9fedb4739 Remove comments 2022-08-05 13:44:22 +02:00
Mark Kaylor
64989e4de7 List allowed types alphabetically 2022-08-05 13:35:34 +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
828fa87b8c
Merge pull request #13990 from strapi/dependabot/npm_and_yarn/storybook/addon-actions-6.5.10 
Bump @storybook/addon-actions from 6.4.10 to 6.5.10
 2022-08-05 12:44:49 +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
Convly
da8d954b8e Merge branch 'master' of github.com:strapi/strapi into chore/graphql-use-graphql-scalars 2022-08-05 10:10:14 +02: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
Gustav Hansen
70f9be00fc
Merge pull request #13985 from strapi/fix/remove-apollo-federation 
GraphQL: Remove unused @apollo/federation dependency
 2022-08-04 20:07:05 +02: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