yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-14 03:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,053 Commits 117 Branches 489 Tags
Commit Graph

6989 Commits

Author SHA1 Message Date
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
Mark Kaylor
ef891a1a9e Move type check to register 2022-08-03 12:07:37 +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
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
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
Mark Kaylor
8eff28bf88 Use a dedicated section for injected inputs 2022-08-03 11:40:29 +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
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
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
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
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
Mark Kaylor
6a5f4a97b9 Inject inputs from plugins 2022-08-02 11:28:14 +02:00
Bassel Kanso
fca84ede09 Merge branch 'master' into fix/counting-when-deep-filtering 2022-08-02 12:14:45 +03:00
Bassel Kanso
749d1906f9 add e2e tests to cover the counting case in the meta when deep filtering 2022-08-02 11:52:19 +03:00
Ben Irvin
794b5e155d revert generateAbility 2022-08-02 10:44:31 +02:00
Ben Irvin
db1531cc98 fix mocks 2022-08-02 10:13:18 +02:00
Mark Kaylor
4d3e0a4b15 Add custom field validation registered by user 2022-08-02 09:15:26 +02:00
Alexandre Bodin
7039c0d228 v4.3.2 2022-08-01 17:18:09 +02:00
Pierre Noël
1eab2fb08c v4.3.1 2022-08-01 16:44:44 +02:00
Marc-Roig
09fdd984c1 test upload image 2022-08-01 15:53:03 +02:00
Julie Plantey
9fa0adeb8e feedback fixes 2022-08-01 15:41:56 +02:00
Gustav Hansen
d9a7e21abe chore: Update snapshot tests 2022-08-01 15:28:01 +02:00
Gustav Hansen
17e8700365 chore: Update @strapi/design-system to 1.2.1 2022-08-01 15:04:27 +02:00
Gustav Hansen
ae71c7a7c4 chore: Update @strapi/design-system to 1.2.1-beta.0 2022-08-01 14:54:13 +02:00