yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-27 10:15:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,846 Commits 116 Branches 490 Tags
Commit Graph

12157 Commits

Author SHA1 Message Date
Ben Irvin
36d37706ce add lifespan and expiresAt fields 2022-08-19 16:33:58 +02:00
Simone Taeggi
e8fc84affd fix linting errors 2022-08-19 15:56:41 +02:00
Simone Taeggi
6b05d3cbba Merge branch 'features/api-token-v2' into api-token-v2/api-tokens-design-details 2022-08-19 15:46:08 +02:00
Simone Taeggi
754ed2ffa4 refactor the coverage script for the helper plugin 2022-08-19 15:40:38 +02:00
Bassel Kanso
96f23ec774 Merge branch 'main' into features/api-token-v2 2022-08-19 12:36:25 +03:00
Alexandre Bodin
8f44422e8e Handles sqlite not able to add an increment table 2022-08-19 11:14:38 +02:00
Alexandre Bodin
714268f310 Add primary keys to relational table 2022-08-19 09:58:20 +02:00
Simone Taeggi
96e26338ff fix the PR based on Alex comment related where to define the coverage options 2022-08-19 09:05:46 +02:00
Simone Taeggi
9d9f7d2a86 Merge branch 'main' into chore/add-coverage-script-in-the-admin-package-json 2022-08-19 08:56:55 +02:00
Julie Plantey
8f52e4178a Merge branch 'main' of https://github.com/strapi/strapi into dependabot/npm_and_yarn/date-fns-2.29.1 2022-08-18 18:33:22 +02:00
Julie Plantey
73b12aa94d upgrading to v2.29.2 because 2.29.1 introduced a breaking change on intervalToDuration 2022-08-18 18:31:27 +02:00
Simone Taeggi
f8e6757519 merge features/api-token-v2 2022-08-18 18:28:07 +02:00
Simone Taeggi
e0798960c0 Add shadow to the Permissions container and close the Accordion if another one is selected 2022-08-18 18:18:29 +02:00
Julie Plantey
2ae55c2739 fix ApiTokens LV tests 2022-08-18 17:59:44 +02:00
Rémi de Juvigny
09230a8b78 Show custom field icon on CM settings modal 2022-08-18 17:45:49 +02:00
Rémi de Juvigny
c383b3fe36 Remove customFieldUid from generic input 2022-08-18 17:44:34 +02:00
Rémi de Juvigny
b70870a233 Move suspense up the tree 2022-08-18 17:41:09 +02:00
Rémi de Juvigny
785639c5ec Move custom field type out of helper plugin 2022-08-18 17:32:51 +02:00
Marc-Roig
6022e327d3 Merge branch 'main' into fix/delete-components-when-deleting-entity 2022-08-18 17:23:21 +02:00
Marc-Roig
3577fae4e4 get list of components to delete them afterwards 2022-08-18 17:19:18 +02:00
Rémi de Juvigny
01d8f37507 Add condition to customInputs 2022-08-18 16:32:05 +02:00
Ben Irvin
c8af2cef6b remove log 2022-08-18 14:55:57 +02:00
Ben Irvin
f30f25ecbe lint 2022-08-18 14:52:16 +02:00
Ben Irvin
7ce7db6604 update tests 2022-08-18 14:12:34 +02:00
Ben Irvin
9941198dac fix regeneration 2022-08-18 14:03:59 +02:00
Ben Irvin
7098ae95be Merge branch 'api-token-v2/backend/regenerate-token' into api-token-v2/regenerate-tokens-api 2022-08-18 13:48:06 +02:00
Ben Irvin
06d95419f4 add regeneration of tokens 2022-08-18 13:31:02 +02:00
Ben Irvin
21845bb0d0 remove lastUsed from create 2022-08-18 12:30:27 +02:00
Ben Irvin
fd05d49346 fix linting 2022-08-18 12:24:13 +02:00
Ben Irvin
b2b1432322 Merge branch 'features/api-token-v2' into api-token-v2/permissions-for-api-token 2022-08-18 12:20:45 +02:00
Rémi de Juvigny
64c5c10f34 Restore ternary 2022-08-18 12:19:06 +02:00
Ben Irvin
622d00930f fix required attributes 2022-08-18 12:13:29 +02:00
Ben Irvin
c61e402461 disallow updating lastUsed from api 2022-08-18 12:03:25 +02:00
Ben Irvin
745a3a8497 add lastUsed to yup validation schema 2022-08-18 12:00:47 +02:00
Ben Irvin
9de7791fad cleanup 2022-08-18 11:53:30 +02:00
Bassel Kanso
3fb0206a25 fix lint issues 2022-08-18 12:43:38 +03:00
Rémi de Juvigny
6e3b2d683a Fix custom field input loader remounting 2022-08-18 11:28:30 +02:00
Bassel Kanso
4c07dec65f Merge branch 'features/api-token-v2' of https://github.com/strapi/strapi into features/api-token-v2 2022-08-18 12:20:56 +03:00
Bassel Kanso
baad6fd93f Merge branch 'main' into features/api-token-v2 2022-08-18 12:18:09 +03:00
Ben Irvin
7b60783888 fix e2e tests 2022-08-18 11:02:24 +02:00
Ben Irvin
449f982781 Merge branch 'api-token-v2/permissions-for-api-token' into api-token-v2/access-times-backend 2022-08-18 10:55:11 +02:00
Ben Irvin
e28c9e7ec9 add lastUsed 2022-08-18 10:22:09 +02:00
Julie Plantey
791b7f5e44 wip 2022-08-18 09:52:57 +02:00
Rémi de Juvigny
1fed0afa01 Try InputLoader 2022-08-18 09:50:27 +02:00
Simone Taeggi
2ea3c317e5 add updatedAt field in the list of token 2022-08-18 09:46:39 +02:00
Gustav Hansen
7d72343aac
Merge pull request #14077 from strapi/dependabot/npm_and_yarn/axios-0.27.2 
Bump axios from 0.24.0 to 0.27.2
 2022-08-18 09:33:30 +02:00
Ben Irvin
215735b0cd update lastUsed when token is accessed 2022-08-17 23:28:35 +02:00
Ben Irvin
f95bb29d76 add lastUsed 2022-08-17 23:28:20 +02:00
Julie Plantey
d312648a77 RelationList height & scroll 2022-08-17 17:09:32 +02:00
Julie Plantey
3b77b20218 disabled state 2022-08-17 16:17:23 +02:00