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

24134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Convly
46b28db877 Fix invalid enum value used to assert 'changingTypeToCustom' 2022-08-25 13:56:24 +02:00
Ben Irvin
b3fe16b3c6
Merge pull request #14186 from strapi/api-token-v2/backend-expirations 
Api token v2/backend expirations
 2022-08-25 13:14:27 +02:00
Gustav Hansen
ffa6a0bc53
Merge pull request #14206 from gitstart/STRAP-65 
0 values are not handled correctly in relations
 2022-08-25 12:54:50 +02:00
Simone Taeggi
ca44733f41 add the regenerate button 2022-08-25 12:31:52 +02:00
Mark Kaylor
308f0375f0 Remove comment and respect naming convention 2022-08-25 12:05:10 +02:00
Ben Irvin
9e42345011 yup blocks unexpected fields 2022-08-25 12:01:52 +02:00
Mark Kaylor
76e01be4cd Add custom fields plugin and color-picker custom field 2022-08-25 12:01:13 +02:00
dependabot[bot]
9d76db0380
Bump @storybook/addon-links from 6.5.9 to 6.5.10 
Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links) 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/addons/links)

---
updated-dependencies:
- dependency-name: "@storybook/addon-links"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-25 09:08:55 +00:00
Simone Taeggi
cce909d1ae add the access action to the e2e tests 2022-08-25 10:00:52 +02:00
Mark Kaylor
fc78298ae4 Merge branch 'main' of github.com:strapi/strapi into features/custom-fields v4.4.0-alpha.0 2022-08-25 09:37:19 +02:00
markkaylor
00adfc166b
Merge pull request #14207 from strapi/custom-fields/remove-map-components 
[Custom fields] Remove all traces of map custom field
 2022-08-25 09:26:45 +02:00
Mark Kaylor
a5d56169de Remove all traces of map custom field 2022-08-25 09:16:07 +02:00
Simone Taeggi
6a88df20c4 Merge branch 'features/api-token-v2' into api-token-v2/settings-access-api-token 2022-08-25 09:10:26 +02:00
Simone Taeggi
826f9eaf40 Merge branch 'main' into features/api-token-v2 2022-08-25 09:09:48 +02:00
Simone Taeggi
3017fd5e41 update e2e test 2022-08-25 08:52:42 +02:00
gitstart
f67f226102 0 values are not handled correctly in relations 2022-08-25 06:48:27 +00:00
Ben Irvin
2195e9a2f2 fix comment 2022-08-24 19:05:13 +02:00
Ben Irvin
3ca863d80b fix failing test 2022-08-24 19:02:38 +02:00
Alexandre BODIN
a5ae7a818c
Merge pull request #14173 from strapi/dependabot/npm_and_yarn/koa/cors-3.4.1 
Bump @koa/cors from 3.1.0 to 3.4.1
 2022-08-24 18:56:59 +02:00
Simone Taeggi
d8cbe58dd5 Merge branch 'features/api-token-v2' into api-token-v2/settings-access-api-token 2022-08-24 18:20:28 +02:00
Ben Irvin
2b30007f86 lifespan must be greater than zero 2022-08-24 18:05:51 +02:00
Ben Irvin
2359ca1cc6 fix tests 2022-08-24 18:05:36 +02:00
Ben Irvin
53be3b5d30 make name unique 2022-08-24 18:04:12 +02:00
Bassel Kanso
64663febef Merge branch 'features/api-token-v2' into api-token-v2/permissions-route 2022-08-24 18:58:27 +03:00
Bassel Kanso
ea2db51fda update permissions package version 2022-08-24 18:57:36 +03:00
Simone Taeggi
37135ac742 Merge branch 'features/api-token-v2' into api-token-v2/settings-access-api-token 2022-08-24 17:26:07 +02:00
Bassel Kanso
ef922ec0fd Merge branch 'features/api-token-v2' into api-token-v2/permissions-route 2022-08-24 18:09:43 +03:00
Bassel Kanso
e8bca67186 create route for api token layout 2022-08-24 18:08:17 +03:00
Simone Taeggi
674a820c82 update permissions package 2022-08-24 16:39:58 +02:00
Ben Irvin
6577a9533c use lodash/fp 2022-08-24 16:29:39 +02:00
Ben Irvin
574448deae remove comments 2022-08-24 16:27:48 +02:00
Ben Irvin
a3a584d176 allow lifespan to update 2022-08-24 16:27:15 +02:00
Ben Irvin
1bd9fbdd85 fix return type 2022-08-24 16:26:40 +02:00
Simone Taeggi
382a81b94e Merge branch 'features/api-token-v2' into api-token-v2/settings-access-api-token 2022-08-24 16:04:02 +02:00
Simone Taeggi
573084845c Merge branch 'features/api-token-v2' of github.com:strapi/strapi into features/api-token-v2 2022-08-24 16:02:58 +02:00
Simone Taeggi
7e99205b28 Merge branch 'main' into features/api-token-v2 2022-08-24 16:02:46 +02:00
Simone Taeggi
160352044a Merge branch 'main' into features/api-token-v2 2022-08-24 16:01:33 +02:00
dependabot[bot]
1af3d1891c
Bump @koa/cors from 3.1.0 to 3.4.1 
Bumps [@koa/cors](https://github.com/koajs/cors) from 3.1.0 to 3.4.1.
- [Release notes](https://github.com/koajs/cors/releases)
- [Changelog](https://github.com/koajs/cors/blob/master/History.md)
- [Commits](https://github.com/koajs/cors/compare/3.1.0...3.4.1)

---
updated-dependencies:
- dependency-name: "@koa/cors"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-24 14:01:29 +00:00
Alexandre Bodin
4c6e67c493 v4.3.6 v4.3.6 2022-08-24 15:53:23 +02:00
Alexandre BODIN
33d0b0c606
Merge pull request #14198 from strapi/hotfix/graphql-should-exist 
Loading a plugin should always verify its presence
 2022-08-24 15:52:59 +02:00
Simone
eba39a6209
Merge pull request #14133 from strapi/api-token-v2/api-tokens-design-details 
Add shadow to the Permissions container and close the Accordion if an…
 2022-08-24 15:52:43 +02:00
Alexandre Bodin
fd8e4c6bfa Add check in security middleware 2022-08-24 15:47:43 +02:00
Alexandre Bodin
9ad6931823 Loading a plugin should always verify its presence 2022-08-24 15:41:37 +02:00
WalkingPizza
13b9bae03e Make view config button small 2022-08-24 14:57:16 +02:00
WalkingPizza
a3c0b3b10b Make all header primary actions small 2022-08-24 14:49:01 +02:00
markkaylor
4c83ad4225
Merge pull request #14169 from strapi/custom-fields/fix-validation 
[Custom fields] Fix content manager field validations
 2022-08-24 14:20:10 +02:00
Alexandre Bodin
a52b053551 v4.3.5 v4.3.5 2022-08-24 14:10:18 +02:00
Alexandre BODIN
c0cc71ddf5
Merge pull request #14191 from strapi/chore/eslint-ecma2020 
Move eslint to ecma version 2020
 2022-08-24 14:02:41 +02:00
Gustav Hansen
6ceb77e37b
Merge pull request #13597 from Jose4gg/master 
Allow to pass `step` to datetime/time fields
 2022-08-24 13:38:20 +02:00
Ben Irvin
568892af97 add controller tests 2022-08-24 13:01:29 +02:00