mirror of
https://github.com/langgenius/dify.git
synced 2026-08-03 11:46:37 +08:00
1f7da9c191
Conflicts resolved: - api/services/app_service.py: extend AppListParams with status + openapi_visible fields so the openapi caller's per-page visibility gate survives the dict->BaseModel refactor; openapi controller now constructs AppListParams. - pnpm-workspace.yaml: union of CLI-only entries (@napi-rs/keyring, @oclif/*) with main's bumped versions (@next/*, @orpc/*, eslint-plugin-sonarjs, eslint-plugin-storybook); kept eventsource-parser. - pnpm-lock.yaml: regenerated. - web/app/signin/utils/post-login-redirect.ts: union impl — keep main's resolvePostLoginRedirect(searchParams) + setOAuthPendingRedirect; add hardened sessionStorage-based setPostLoginRedirect for device flow with same-origin + path whitelist; device redirect takes precedence over oauth pending. |
||
|---|---|---|
| .. | ||
| api-tests.yml | ||
| autofix.yml | ||
| build-push.yml | ||
| cli-release.yml | ||
| cli-smoke.yml | ||
| cli-tests.yml | ||
| db-migration-test.yml | ||
| deploy-agent-dev.yml | ||
| deploy-dev.yml | ||
| deploy-enterprise.yml | ||
| deploy-hitl.yml | ||
| docker-build.yml | ||
| expose_service_ports.sh | ||
| labeler.yml | ||
| main-ci.yml | ||
| pyrefly-diff-comment.yml | ||
| pyrefly-diff.yml | ||
| pyrefly-type-coverage-comment.yml | ||
| pyrefly-type-coverage.yml | ||
| semantic-pull-request.yml | ||
| stale.yml | ||
| style.yml | ||
| tool-test-sdks.yaml | ||
| translate-i18n-claude.yml | ||
| trigger-i18n-sync.yml | ||
| vdb-tests-full.yml | ||
| vdb-tests.yml | ||
| web-e2e.yml | ||
| web-tests.yml | ||