yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-15 04:08:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,133 Commits 116 Branches 489 Tags
Commit Graph

36133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jamie Howard
98835a7df6
Merge pull request #16988 from strapi/rw-assignee/remove-react-select 2023-06-19 09:46:06 +01: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
21dedde764
Merge pull request #16898 from strapi/feature/review-workflow-assignee-list-view-fe 
Enhancement: Render workflow assignee in CM list view
 2023-06-12 17:06:07 +02:00
Jamie Howard
f433f1becc Merge remote-tracking branch 'origin/main' into rw-assignee/remove-react-select 2023-06-12 15:45:09 +01: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
Josh
7df9fa2da1
refactor: use version 2 of breadcrumbs in anticipation of deprecation (#16981) 2023-06-12 14:42:27 +01:00
Gustav Hansen
9e56a694dc Chore: Cleanup eslint/front configuration 2023-06-12 15:15:11 +02:00
Convly
0b01fbf9cc Fix type for the generic core api service 2023-06-12 15:08:53 +02:00
Gustav Hansen
0f7ea43985 Chore: Simplify settings router defaults 2023-06-12 13:48:48 +02:00
Gustav Hansen
588b9cc816 Chore: Add tests for useEnterprise() hook 2023-06-12 13:48:48 +02:00
Gustav Hansen
49629b147b Chore: Replace ee_else_ce babel plugin for auth router 2023-06-12 13:40:40 +02:00
Gustav Hansen
f60ef2c0a8 Chore: Start using useEnterprise to load the settings router 2023-06-12 13:40:40 +02:00
Gustav Hansen
5b4c13c99a Enhancement: Ass userEnterprise() hook 2023-06-12 12:59:21 +02:00
Convly
5b3cbdce9d Fix type for the core api service 2023-06-12 12:35:50 +02:00
Jean-Sébastien Herbaux
30e56b8376
Merge pull request #16917 from strapi/features/type-system 2023-06-12 11:48:28 +02:00
markkaylor
01e461d267
Merge pull request #16979 from strapi/fix/marketplace-stats 2023-06-12 11:24:54 +02:00
Jamie Howard
102e766e20 Merge remote-tracking branch 'origin/feature/review-workflow-assignee' into feature/review-workflow-assignee-list-view-fe 2023-06-12 10:02:10 +01:00
Marc
cc4f58ce38
Merge pull request #16552 from strapi/fix/remove-persisted-tables-from-store 2023-06-12 10:53:21 +02:00