yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-10 09:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,053 Commits 115 Branches 488 Tags
Commit Graph

6989 Commits

Author SHA1 Message Date
Ben Irvin
0918729d21 Merge branch 'features/api-token-v2' into api-token-v2/backend-expirations 2022-08-22 17:54:33 +02:00
Ben Irvin
82e5cb3855 Merge branch 'main' into features/api-token-v2 2022-08-22 17:45:00 +02:00
Ben Irvin
48107d1000 Merge branch 'main' into api-token-v2/fix-syncActions 2022-08-22 17:32:48 +02:00
Ben Irvin
7a1de40bb6 register actions in contentapi bootstrap 2022-08-22 17:31:15 +02:00
Julie Plantey
cabae0b54e fix snapshots 2022-08-22 16:49:13 +02:00
Julie Plantey
ca24339d6a tests for custom Option 2022-08-22 16:28:22 +02:00
Mark Kaylor
7883d1578a Merge branch 'main' of github.com:strapi/strapi into features/custom-fields 2022-08-22 15:49:15 +02:00
Julie Plantey
ecb2191f1e pxToRem import fix 2022-08-22 15:47:07 +02:00
Simone
f4c6a953bf
Merge pull request #14109 from strapi/chore/add-coverage-script-in-the-admin-package-json 
Add coverage script in the admin
 2022-08-22 15:45:38 +02:00
Julie Plantey
b615f45eca Merge branch 'feature/relations-main-view-relationinput-interface' of https://github.com/strapi/strapi into relationinput/select-option 2022-08-22 14:28:05 +02:00
Julie Plantey
a189bafc20 Merge branch 'feature/relations-main-view' of https://github.com/strapi/strapi into feature/relations-main-view-relationinput-interface 2022-08-22 14:24:47 +02:00
Julie Plantey
2346e3e074
Merge pull request #14111 from strapi/fix/dynamic-tables-headers-translations 
[Fix] Dynamic table translations
 2022-08-22 14:03:30 +02:00
Ben Irvin
aa5a1c7ed7 regenerate throws on invalid id 2022-08-22 12:33:00 +02:00
Ben Irvin
dabbd42ca7 assert acessKey has changed 2022-08-22 12:22:36 +02:00
Ben Irvin
ae90cf5fd0 Merge branch 'api-token-v2/regenerate-tokens-api' into api-token-v2/backend-expirations 2022-08-22 12:11:46 +02:00
Simone Taeggi
a4441227f7 Merge branch 'main' into chore/add-coverage-script-in-the-admin-package-json 2022-08-22 09:51:35 +02:00
Julie Plantey
f86241fbbb feedback fix tableHeaders 2022-08-22 09:32:41 +02:00
Gustav Hansen
a024a40d1a Merge branch 'main' into feature/relations-main-view 2022-08-22 09:28:39 +02:00
Ben Irvin
6de74793df add test todos 2022-08-22 09:26:20 +02:00
Ben Irvin
55dee1a09d verify expiration of token 2022-08-22 09:25:55 +02:00
Simone Taeggi
2823ab7d24 update snapshots 2022-08-19 18:40:29 +02:00
Simone Taeggi
6397974ebb add empty value without lastUpdatetAt value 2022-08-19 18:38:51 +02:00
Simone Taeggi
88f914c630 change the field to the lastUsedAt field 2022-08-19 17:47:52 +02:00
Simone Taeggi
76efd01690 Merge branch 'features/api-token-v2' into api-token-v2/last-activity-of-an-api-token 2022-08-19 17:37:15 +02:00
Simone Taeggi
62f3d92543 Merge branch 'features/api-token-v2' into api-token-v2/last-activity-of-an-api-token 2022-08-19 17:23:09 +02:00
Ben Irvin
3c7c391a85
Merge pull request #14129 from strapi/api-token-v2/permissions-for-api-token 
Api token v2/permissions for api token
 2022-08-19 16:57:04 +02:00
Ben Irvin
a063f21474 jsdoc comments 2022-08-19 16:53:51 +02:00
Ben Irvin
c5eb2b1a9d rename mapTokenPermissions to flattenTokenPermissions 2022-08-19 16:45:16 +02:00
Ben Irvin
d4f03c7d56 declare functions before use 2022-08-19 16:42:55 +02:00
Ben Irvin
c6aef125c9 fix jsdoc params 2022-08-19 16:41:39 +02:00
Ben Irvin
e79617b094 lastUsedAt isn't a valid update field 2022-08-19 16:37:41 +02:00
Ben Irvin
e3961fb298 rename lastUsed to lastUsedAt 2022-08-19 16:36:28 +02:00
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