yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-04 14:56:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 111 Branches 487 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simone Taeggi
e1622b5b9b update snapshots 2023-02-06 12:03:16 +01:00
Simone Taeggi
d5ed19db6c Merge branch 'data-transfer/transfer-tokens' of github.com:strapi/strapi into data-transfer/transfer-tokens 2023-02-06 12:01:07 +01:00
Simone Taeggi
f1dad8b19e fixes on PR and bugs 2023-02-06 12:00:50 +01:00
Gustav Hansen
79c9efe703
Merge pull request #15684 from strapi/dependabot/npm_and_yarn/docs/http-cache-semantics-4.1.1 
chore(deps): bump http-cache-semantics from 4.1.0 to 4.1.1 in /docs
 2023-02-06 11:54:32 +01:00
Gustav Hansen
84e1527da5
Merge pull request #15685 from strapi/dependabot/npm_and_yarn/http-cache-semantics-4.1.1 
chore(deps): bump http-cache-semantics from 4.1.0 to 4.1.1
 2023-02-06 11:54:12 +01:00
Josh
559c4ccd3d fix: we should always try and apply the relation paths if they exist 2023-02-06 10:46:10 +00:00
Rémi de Juvigny
41e7d2a5d0 Rename audit logs table name 2023-02-06 11:45:58 +01:00
Nathan Pichon
0bd42b52de
Merge branch 'main' into features/patreon-auth-provider 2023-02-06 11:40:26 +01:00
Convly
32e50815a1 Fix unit test 2023-02-06 11:34:12 +01:00
Marc-Roig
4f4b424197 fix mapAsyncDialects type 2023-02-06 11:06:18 +01:00
Marc-Roig
3036dcb1d7 Merge branch 'main' into fix/performance-degradation-in-deeply-nested-coimpos 2023-02-06 11:03:40 +01:00
Simone Taeggi
4eef90d73a Merge branch 'data-transfer/transfer-tokens' of github.com:strapi/strapi into data-transfer/transfer-tokens 2023-02-06 10:55:34 +01:00
Simone Taeggi
38e5e42769 Merge branch 'features/data-transfer' into data-transfer/transfer-tokens 2023-02-06 10:54:42 +01:00
Christian Capeans
2fb83a58cf Merge branch 'features/data-transfer' into data-transfer/transfer-tokens 2023-02-06 10:53:43 +01:00
Nathan Pichon
bbfdda2b14
Merge pull request #15637 from strapi/feature/review-worflow/default-workflow 
feat(review-workflows): add default workflow
 2023-02-06 10:48:31 +01:00
Ben Irvin
78d344a4f0
Merge pull request #15716 from strapi/data-transfer/fix-cli 2023-02-06 10:46:42 +01:00
Ben Irvin
064d7accf5 remove invalid option 2023-02-06 10:42:07 +01:00
Marc-Roig
f8d787192b remove todo 2023-02-06 10:41:55 +01:00
Rémi de Juvigny
0d82afe489
Merge pull request #15690 from strapi/docs/event-hub 
Add event hub page to contributor docs
 2023-02-06 10:30:48 +01:00
Marc-Roig
57a410c6b7 convert pagination query params for load 2023-02-06 10:28:01 +01:00
Convly
635c8a708d Merge branch 'data-transfer/transfer-tokens' of github.com:strapi/strapi into data-transfer/transfer-tokens 2023-02-06 10:16:36 +01:00
Rémi de Juvigny
939f654212 Merge remote-tracking branch 'origin/main' into docs/event-hub 2023-02-06 10:14:43 +01:00
Convly
47c5867688 Remove integer constraint from the API token validation 2023-02-06 10:13:17 +01:00
Jean-Sébastien Herbaux
ffb0b9497a
Update packages/core/admin/server/controllers/transfer/token.js 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2023-02-06 10:12:36 +01:00
Jean-Sébastien Herbaux
9085b98717
Update packages/core/admin/server/controllers/transfer/token.js 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2023-02-06 10:11:31 +01:00
Convly
44c13b9497 Fix jsdoc for TransferToken.permissions 2023-02-06 10:10:29 +01:00
Convly
d3ae89280d Fix API test typo 2023-02-06 10:09:26 +01:00
Convly
bec1dfd555 Remove integer constraint from the transfer token validation 2023-02-06 10:07:56 +01:00
Convly
386579ff66 Update transfer services, fix api tests 2023-02-06 10:03:08 +01:00
markkaylor
18dec12617
Merge branch 'main' into fix/json-input-validation 2023-02-06 09:38:15 +01:00
DMehaffy
7ae4d1c802
Update .github/workflows/issues_handleLabel.yml 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2023-02-03 14:11:29 -07:00
Josh
2aa03b8d94
Merge pull request #15711 from strapi/chore/contributor-docs 2023-02-03 17:17:37 +00:00
Josh
e5e24c0898 chore: tidy-up contributor docs 2023-02-03 17:12:20 +00:00
Simone Taeggi
2c0fa4897a refactor unit test 2023-02-03 18:05:12 +01:00
Simone Taeggi
f3ee8e94fe unit test for the ListView in TransferToken 2023-02-03 17:47:27 +01:00
Simone Taeggi
1ad7b79862 remove DynamicTable from the TransferTokens 2023-02-03 17:25:30 +01:00
Simone Taeggi
916c9f23d5 refactor TransferTokenListView 2023-02-03 17:19:24 +01:00
Simone Taeggi
832bf9981a change table component in ApiTokens 2023-02-03 17:04:41 +01:00
Christian Capeans
275df7345d Merge branch 'data-transfer/transfer-tokens' of https://github.com/strapi/strapi into data-transfer/transfer-tokens 2023-02-03 16:36:40 +01:00
Christian Capeans
3ca95c223a Delete duplicated code 2023-02-03 16:36:17 +01:00
Convly
65bf4cf12f Update permission snapshots 2023-02-03 16:34:21 +01:00
Jean-Sébastien Herbaux
1d791e47ea
Update packages/core/admin/server/controllers/api-token.js 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2023-02-03 16:21:55 +01:00
Jean-Sébastien Herbaux
e10cbe8885
Update packages/core/admin/server/config/admin-actions.js 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2023-02-03 16:21:25 +01:00
Jean-Sébastien Herbaux
b7ae385c7e
Update packages/core/admin/server/controllers/transfer/token.js 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2023-02-03 16:19:02 +01:00
Fernando Chavez
a5a1967d00 Check auth strategy to log events on audit logs 2023-02-03 16:18:53 +01:00
Bassel
a364ee79e4 fix generation of transfer token salt 2023-02-03 16:14:34 +02:00
Ben Irvin
d6d1846372
Merge branch 'features/data-transfer' into data-transfer/transfer-tokens 2023-02-03 15:00:13 +01:00
Ben Irvin
3d4b9ad1da Merge branch 'main' into features/data-transfer 2023-02-03 14:59:52 +01:00
Bassel
20a8fa0c0e add transaction to update, revoke and delete 2023-02-03 15:59:04 +02:00
Simone Taeggi
6afff24137 Merge branch 'main' into data-transfer/transfer-tokens 2023-02-03 14:49:36 +01:00