24134 Commits

Author SHA1 Message Date
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
markkaylor
d84d954e43
Merge pull request #14162 from strapi/custom-fields/remove-map-cf
[Custom fields] remove map cf
2022-08-22 17:18:11 +02:00
Mark Kaylor
8e7ac2155c Remove map custom field 2022-08-22 17:09:07 +02:00
Mark Kaylor
1ca7501c97 Merge branch 'features/custom-fields' of github.com:strapi/strapi into features/custom-fields 2022-08-22 17:03:42 +02:00
Rémi de Juvigny
556070d63d
Merge pull request #14161 from strapi/custom-fields/i18n-icon-fix
[Custom fields] Remove extraneous prop
2022-08-22 16:55:01 +02:00
Rémi de Juvigny
79d845e292 Remove extraneous prop 2022-08-22 16:46:48 +02:00
Rémi de Juvigny
8c42253eb4
Merge pull request #14158 from strapi/custom-fields/i18n-icon
[Custom fields] Display labelAction on example custom field
2022-08-22 16:36:37 +02:00
Rémi de Juvigny
19f9c0be35 Display labelAction on color picker custom field 2022-08-22 16:22:43 +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
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
Rémi de Juvigny
528acf8d16
Merge pull request #14144 from strapi/custom-fields/cm
[Custom fields] Display custom field Input component in the CM edit view
2022-08-22 15:25:46 +02:00
Rémi de Juvigny
ee48e4cbea Remove log 2022-08-22 15:12:29 +02:00
Rémi de Juvigny
7273fa0fe3 Handle disabled state on color picker 2022-08-22 15:12:01 +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
Gustav Hansen
8e14a14938 Sentry: Add os.arch() as event tag 2022-08-22 12:08:24 +02:00
Jean-Sébastien Herbaux
832838fd68
Merge pull request #14138 from strapi/dependabot/npm_and_yarn/sentry/node-6.19.7
Bump @sentry/node from 6.19.6 to 6.19.7
2022-08-22 11:45:56 +02:00
Simone Taeggi
ab5390a238 Merge branch 'features/api-token-v2' into api-token-v2/last-activity-of-an-api-token 2022-08-22 09:53:35 +02:00
Simone Taeggi
423eb0e283 Merge branch 'main' into features/api-token-v2 2022-08-22 09:53:06 +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
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
Gustav Hansen
de4df3874a Amplitude: Add tracking property for os.arch() 2022-08-22 09:14:02 +02:00
Adedoyin Akande
0ad771e44d
Update iso-locales.test.js.snap
Complete the English "en-" prefix with relevant locales based on https://www.localeplanet.com/icu/
2022-08-21 20:26:42 +01:00
Adedoyin Akande
aa4b387343
Update iso-locales.json
Complete the English "en-" prefix with relevant locales based on https://www.localeplanet.com/icu/
2022-08-21 19:55:40 +01: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
Alexandre BODIN
dd35ac75ff
Merge pull request #14147 from strapi/feat/buildStatusBadge
Add Nightly Release build status badge
2022-08-19 18:16:32 +02:00
Alexandre Bodin
ebac1f66f2 chore: github pages permissions 2022-08-19 18:15:50 +02:00
Alexandre Bodin
d1ea986a33 Add pages workflow 2022-08-19 18:11:09 +02:00
derrickmehaffy
51066b6c21 move to html from markdown 2022-08-19 09:05:06 -07:00
DMehaffy
ba3081cb14
Add Nightly Release build status badge
adds the badge to the readme on the nightly build status
2022-08-19 09:01:19 -07:00
Alexandre Bodin
306d52dcac chore: docusaurus baseUrl config 2022-08-19 17:49:34 +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