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
31,294 Commits 115 Branches 488 Tags
Commit Graph

31294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamie Howard
8133fc4384 test(Webhooks/EditView) 2023-06-19 15:22:15 +01:00
Jamie Howard
34483f58ea test(ee): fix tests 2023-06-19 15:15:05 +01:00
Jamie Howard
e6846cec31 test(Settings): expect webhook save button to be disabled 2023-06-19 15:07:31 +01:00
Jamie Howard
8d43691685 fix(Settings): detect is webhook form is dirty 2023-06-19 15:03:32 +01:00
Jamie Howard
02b50ff730 chore: cleanup 2023-06-19 14:47:44 +01:00
Marc
6ccd3f1e91
Merge branch 'main' into fix/rbac-condition-and-relations 2023-06-19 15:19:54 +02:00
Christian
92efcdc2b4
Merge pull request #17021 from strapi/remove-didReceiveAPIRequest 
Remove didReceiveAPIRequest event
 2023-06-19 13:53:42 +02:00
Gustav Hansen
6e01780a75 Fix: Improve default value 2023-06-19 12:59:03 +02:00
Christian
9197eb111b
Merge branch 'main' into remove-didReceiveAPIRequest 2023-06-19 12:53:37 +02:00
Marc-Roig
fceac49066
fix: count relations when webhook populate is disabled 2023-06-19 12:34:24 +02:00
Gustav Hansen
d28f60f2b8 Merge branch 'main' into enhancement/use-enterprise-hook-auth 2023-06-19 12:30:19 +02:00
Jamie Howard
c3876eb9c1 chore: cleanup 2023-06-19 11:27:45 +01:00
Jamie Howard
049059c800 chore: refactor how we get the previous stage 2023-06-19 11:23:09 +01:00
Gustav Hansen
5170e19a23 Fix: Improve defaultValue for ee roles 2023-06-19 12:13:22 +02:00
Christian Capeans
90694bdfbe Remove didReceiveAPIRequest event 2023-06-19 11:53:24 +02:00
Marc
e4ce2dfb79
Merge pull request #17018 from strapi/dependabot/npm_and_yarn/aws-sdk-2.1399.0 2023-06-19 11:39:18 +02:00
Marc-Roig
d08f6cffbf
Merge branch 'main' into fix/rbac-condition-and-relations 2023-06-19 11:37:26 +02:00
Josh
bc6034cf84
chore: remove history & clean up some U&P tests (#16992) 2023-06-19 10:22:38 +01:00
Gustav Hansen
0a3ba688c9 Merge branch 'main' into enhancement/use-enterprise-hook-users-list 2023-06-19 11:19:04 +02:00
Gustav Hansen
86eaf9f728
Merge pull request #16871 from strapi/enhancement/use-enterprise-hook 
POC: Add useEnterprise() hook; refactor settings router
 2023-06-19 11:04:25 +02:00
Gustav Hansen
489efd8fa5
Merge pull request #17019 from strapi/chore/nx-16 
Chore: Bump nx from v15 to v16
 2023-06-19 10:32:47 +02:00
Jean-Sébastien Herbaux
ff9b295916
Merge pull request #17020 from strapi/fix/strapi-service-loose-type 2023-06-19 10:13:00 +02:00
Convly
c0d1646e96 Merge branch 'main' into fix/strapi-service-loose-type 2023-06-19 09:58:24 +02:00
Convly
52626f52b9 Add comment to explain context about the common.service any use 2023-06-19 09:57:47 +02:00
Bassel Kanso
bc0617860d
Merge pull request #16870 from mofahsan/fix/register-api-routes-undefined-error 
Fix: Handle undefined routes in registerAPIRoutes forEach loop
 2023-06-19 10:54:56 +03:00
Convly
e26c1c122b Make the abstract service type looser to allow unsafe calls 2023-06-19 09:45:04 +02:00
Gustav Hansen
8184bf2184 Chore: Bump nx from v15 to v16 2023-06-19 09:42:25 +02:00
Gustav Hansen
0cb8977cdf Merge branch 'main' into enhancement/use-enterprise-hook 2023-06-19 09:32:25 +02:00
Gustav Hansen
c86d26d25a
Merge pull request #16985 from strapi/chore/eslint-sort-imports-front 
Chore: Auto-sort imports using eslint
 2023-06-19 09:18:51 +02:00
dependabot[bot]
e54595c02c
chore(deps): bump aws-sdk from 2.1372.0 to 2.1399.0 
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1372.0 to 2.1399.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1372.0...v2.1399.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-18 23:01:53 +00:00
GitStart
36aa7d250a
Merge branch 'main' into fix/ctb-removes-hidden-fields 2023-06-15 16:13:06 +01:00
Gustav Hansen
02915b3cf0 Enhancement: Replace ee_else_ce imports with useEnterprise in auth 2023-06-13 07:16:45 +02:00
Gustav Hansen
7de42f7030 Chore: Align variable names 2023-06-13 06:54:59 +02:00
Gustav Hansen
a57127c47a Chore: Cleanup utils 2023-06-13 06:52:37 +02:00
Gustav Hansen
005f91bdcc Chore: Replace role layout ee_else_ce imports with useEnterprise 2023-06-13 06:49:02 +02:00
Gustav Hansen
a1fbbee8f7 Chore: Replace ee_else_ce imports in users list 2023-06-13 06:42:22 +02:00
Gustav Hansen
721318eed1 Docs: Add contributor docs for the userEnterprise hook 2023-06-13 06:28:00 +02:00
Gustav Hansen
96948e0d1e Chore: Update snapshot tests 2023-06-12 22:10:54 +02:00
Gustav Hansen
dca5778d8e Chore: Apply eslint import sorting fix 2023-06-12 21:34:07 +02:00
Gustav Hansen
dfbe582cd7 Chore: Add eslint simple-sort plugin 2023-06-12 21:34:06 +02:00
dependabot[bot]
cfddbe3d20
chore(deps): bump winston from 3.3.3 to 3.9.0 
Bumps [winston](https://github.com/winstonjs/winston) from 3.3.3 to 3.9.0.
- [Release notes](https://github.com/winstonjs/winston/releases)
- [Changelog](https://github.com/winstonjs/winston/blob/master/CHANGELOG.md)
- [Commits](https://github.com/winstonjs/winston/compare/v3.3.3...v3.9.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-12 15:29:42 +00:00
Jamie Howard
89dad0d065 fix(ee): tests 2023-06-12 16:29:12 +01:00
Jean-Sébastien Herbaux
aea0ea8350
Merge pull request #16990 from strapi/releases/4.11.1 2023-06-12 17:27:43 +02:00
Jean-Sébastien Herbaux
c9660789fc
Merge pull request #16989 from strapi/feat/release_4.11.1 2023-06-12 17:26:03 +02:00
Jamie Howard
4dd26a2445 feature(ee): emit workflow id with stage change event 2023-06-12 16:24:09 +01:00
Marc-Roig
ae3463646d
update: yarn lock 2023-06-12 17:14:00 +02:00
Marc-Roig
6cdb5a7737
v4.11.1 v4.11.1 2023-06-12 17:10:44 +02:00
Gustav Hansen
9d554ec9aa
Merge pull request #16986 from strapi/fix/use-enterprise-tests 
test: remove erroneous act calls
 2023-06-12 16:02:18 +02:00
Gustav Hansen
11f5c5a852
Merge pull request #16984 from strapi/chore/eslint-cleanup-front 
Chore: Cleanup eslint/front configuration
 2023-06-12 16:00:43 +02:00
Josh
f5a9528422 test: update to remove act calls 2023-06-12 14:55:22 +01:00