yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 10:55:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,459 Commits 121 Branches 507 Tags
Commit Graph

23459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ben Irvin
9e42345011 yup blocks unexpected fields 2022-08-25 12:01:52 +02:00
Simone Taeggi
826f9eaf40 Merge branch 'main' into features/api-token-v2 2022-08-25 09:09:48 +02: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
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
ea2db51fda update permissions package version 2022-08-24 18:57:36 +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
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
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
Alexandre Bodin
554671cfd8 Move to ecma2020 2022-08-24 12:56:28 +02:00
Jose Gomez
39b8ece5c9 Check if the current time matches the selected interval 2022-08-24 12:42:08 +02:00
Jose Gomez
f30fd3e812 Fix lint errors 2022-08-24 12:42:08 +02:00
Jose Gomez
8e5364b54d Remove unnecessary getStep for datetime/time condition 2022-08-24 12:42:08 +02:00
Jose Gomez
612112e499 Add step input for datetime/time fields 2022-08-24 12:42:07 +02:00
Ben Irvin
589a5bd1cf fix test timing 2022-08-24 12:37:21 +02:00
Simone Taeggi
8e26e338e7 update failing snapshot 2022-08-24 12:17:39 +02:00
Simone Taeggi
84758b6985 Merge branch 'features/api-token-v2' into api-token-v2/api-tokens-design-details 2022-08-24 11:33:42 +02:00
Simone Taeggi
527c304366 Merge branch 'main' into features/api-token-v2 2022-08-24 11:31:08 +02:00
Simone
4b4614c466
Merge pull request #14176 from strapi/api-token-v2/change-primary-button-size-on-api-token-list 
Fix primary button size on API Tokens List and Edit views
 2022-08-24 11:29:58 +02:00
Ben Irvin
58a152ff2e token counts as expired when zero 2022-08-24 10:55:28 +02:00
Ben Irvin
93f6ca30ef typo 2022-08-24 10:54:34 +02:00
Ben Irvin
73345efa54 add tests for expiry 2022-08-24 10:48:24 +02:00
Julie Plantey
faac5b3964
Merge pull request #14116 from alvesvaren/master 
Add missing swedish core admin translations
 2022-08-24 10:37:53 +02:00
Julie Plantey
c4e6d21e4f
Merge pull request #13994 from yangfei4913438/yangfei/lang-code 
show language code
 2022-08-24 10:36:48 +02:00
Julie Plantey
e309130ae6
Merge pull request #14115 from Hertak/master 
Update es.json
 2022-08-24 10:34:32 +02:00
Julie Plantey
43d372413d
Merge pull request #14100 from rogix/feat/update-pr-br-translation 
Update pt-BR translation
 2022-08-24 10:33:39 +02:00
Ben Irvin
412f21e973 token doesn't authorize when expired 2022-08-24 10:32:24 +02:00
Gustav Hansen
435645638e
Merge pull request #14182 from strapi/fix/cm-edit-settings-view-tests 
CM: Fix test errors for EditSettingsView
 2022-08-24 10:30:53 +02:00
Simone Taeggi
368a8b6c23 Merge branch 'features/api-token-v2' into api-token-v2/api-tokens-design-details 2022-08-24 10:29:24 +02:00
Simone Taeggi
20529f4a97 Merge branch 'features/api-token-v2' into api-token-v2/change-primary-button-size-on-api-token-list 2022-08-24 10:26:47 +02:00
Simone Taeggi
9114494d80 Merge branch 'main' into features/api-token-v2 2022-08-24 10:26:14 +02:00
Ben Irvin
98d82a0285 fix tests 2022-08-24 10:01:36 +02:00