yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-21 06:22:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,691 Commits 123 Branches 496 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Gustav Hansen
8bff5319c3
Merge pull request #14103 from strapi/feature/relations-main-view-useRelation 
CM: Implement useRelation hook to fetch relation data asynchronous
 2022-08-22 09:17:54 +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
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
Alexandre Bodin
1ee76ce6e3 chore: udpate docusaure config 2022-08-19 14:03:16 +02:00
Bassel Kanso
61923e62ae modify test 2022-08-19 14:56:31 +03:00
Alexandre Bodin
142cb086ff Merge branch 'main' of github.com:strapi/strapi 2022-08-19 13:54:37 +02:00
Rémi de Juvigny
7e9394f66e
Merge pull request #14137 from strapi/custom-fields/cm-settings 
[Custom fields] Apply content manager settings on custom fields
 2022-08-19 13:54:25 +02:00
Alexandre Bodin
bae43881b8 chore: update docusaurus version 2022-08-19 13:54:25 +02:00
Rémi de Juvigny
620146187f Translate format indicator 2022-08-19 12:19:02 +02:00
Bassel Kanso
96f23ec774 Merge branch 'main' into features/api-token-v2 2022-08-19 12:36:25 +03:00
Alexandre BODIN
f589ccef26
Merge pull request #14118 from strapi/chore/automated-releases 
Automated nightly releases
 2022-08-19 11:25:58 +02:00
Alexandre Bodin
8f44422e8e Handles sqlite not able to add an increment table 2022-08-19 11:14:38 +02:00
dependabot[bot]
6815378001
Bump nexus from 1.2.0 to 1.3.0 
Bumps [nexus](https://github.com/graphql-nexus/nexus) from 1.2.0 to 1.3.0.
- [Release notes](https://github.com/graphql-nexus/nexus/releases)
- [Changelog](https://github.com/graphql-nexus/nexus/blob/main/CHANGELOG.md)
- [Commits](https://github.com/graphql-nexus/nexus/commits/v1.3.0)

---
updated-dependencies:
- dependency-name: nexus
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-19 09:12:05 +00:00
dependabot[bot]
55ab41d694
Bump @sentry/node from 6.19.6 to 6.19.7 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 6.19.6 to 6.19.7.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/6.19.6...6.19.7)

---
updated-dependencies:
- dependency-name: "@sentry/node"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-19 09:08:22 +00:00
Rémi de Juvigny
752b671487
Merge pull request #14130 from strapi/custom-fields/cm-input 
[Custom fields] Add custom field input component in CM edit view
 2022-08-19 10:43:35 +02:00
Alexandre Bodin
714268f310 Add primary keys to relational table 2022-08-19 09:58:20 +02:00
Julie Plantey
1079234a55
Merge pull request #14074 from strapi/dependabot/npm_and_yarn/date-fns-2.29.1 
Bump date-fns from 2.28.0 to 2.29.1
 2022-08-19 09:44:48 +02:00