|
|
8775003732
|
Merge branch 'main' into sandboxed-agent-rebase
Made-with: Cursor
# Conflicts:
# api/tests/unit_tests/controllers/console/app/test_message.py
# api/tests/unit_tests/controllers/console/app/test_statistic.py
# api/tests/unit_tests/controllers/console/app/test_workflow_draft_variable.py
# api/tests/unit_tests/controllers/console/auth/test_data_source_bearer_auth.py
# api/tests/unit_tests/controllers/console/auth/test_data_source_oauth.py
# api/tests/unit_tests/controllers/console/auth/test_oauth_server.py
# web/app/components/header/account-setting/data-source-page/data-source-notion/operate/index.tsx
# web/app/components/header/account-setting/data-source-page/data-source-website/config-firecrawl-modal.tsx
# web/app/components/header/account-setting/data-source-page/data-source-website/config-jina-reader-modal.tsx
# web/app/components/header/account-setting/data-source-page/data-source-website/config-watercrawl-modal.tsx
# web/app/components/header/account-setting/data-source-page/panel/config-item.tsx
# web/app/components/header/account-setting/data-source-page/panel/index.tsx
# web/app/components/workflow/nodes/knowledge-retrieval/node.tsx
# web/package.json
# web/pnpm-lock.yaml
|
2026-03-24 11:19:50 +08:00 |
|
|
|
fd124e6d32
|
Merge main HEAD (segment 5) into sandboxed-agent-rebase
Resolve 83 conflicts: 10 backend, 62 frontend, 11 config/lock files.
Preserve sandbox/agent/collaboration features while adopting main's
UI refactorings (Dialog/AlertDialog/Popover), model provider updates,
and enterprise features.
Made-with: Cursor
|
2026-03-23 14:20:06 +08:00 |
|
|
|
abd68d2ea6
|
chore(i18n): sync translations with en-US (#33894)
Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
|
2026-03-23 14:05:47 +08:00 |
|
|
|
8384a836b4
|
fix(i18n): standardize datetime display to 24-hour format on /apps page (#33847)
|
2026-03-23 10:04:01 +08:00 |
|
|
|
947fc8db8f
|
chore(i18n): sync translations with en-US (#33804)
Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
|
2026-03-20 15:45:54 +08:00 |
|
|
|
f35a4e5249
|
chore(i18n): sync translations with en-US (#33796)
Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
|
2026-03-20 14:19:37 +08:00 |
|
|
|
11e1787100
|
chore(i18n): sync translations with en-US (#33749)
Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
|
2026-03-19 22:03:07 +08:00 |
|
|
|
942087cbdb
|
feat(confirm): input app name for app deletion confirmation (#33660)
|
2026-03-19 14:25:29 +08:00 |
|
|
|
bbe975c6bc
|
feat: enhance model plugin workflow checks and model provider management UX (#33289)
Signed-off-by: yyh <yuanyouhuilyz@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: CodingOnStar <hanxujiang@dify.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Coding On Star <447357187@qq.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: statxc <tyleradams93226@gmail.com>
|
2026-03-18 10:16:15 +08:00 |
|
|
|
076b297b18
|
chore(i18n): sync translations with en-US (#33586)
Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
|
2026-03-17 19:42:31 +08:00 |
|
|
|
da2049be76
|
chore(i18n): sync translations with en-US (#33585)
Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
|
2026-03-17 19:34:41 +08:00 |
|
|
|
e26d8a63da
|
feat: add marketplace template localization for multiple languages
|
2026-03-03 17:59:31 +08:00 |
|
|
|
e730124740
|
Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox
# Conflicts:
# api/uv.lock
# web/app/components/apps/__tests__/app-card.spec.tsx
# web/app/components/apps/__tests__/list.spec.tsx
# web/app/components/datasets/create/__tests__/index.spec.tsx
# web/app/components/datasets/metadata/metadata-dataset/__tests__/dataset-metadata-drawer.spec.tsx
# web/app/components/plugins/readme-panel/__tests__/index.spec.tsx
# web/app/components/rag-pipeline/__tests__/index.spec.tsx
# web/app/components/rag-pipeline/hooks/__tests__/index.spec.ts
# web/eslint-suppressions.json
|
2026-02-13 15:17:52 +08:00 |
|
|
|
17ba8af331
|
Revert "Merge branch 'zhsama/remove-reasoning-ui' into feat/support-agent-sandbox"
This reverts commit f6b0fda9f7, reversing
changes made to f359bbc5de.
|
2026-02-11 21:16:57 +08:00 |
|
|
|
2bf767d5f7
|
feat: add Creators Platform helper for DSL upload and OAuth redirect (Vibe Kanban) (#32232)
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
|
2026-02-11 21:10:48 +08:00 |
|
|
|
f01f7a0d32
|
chore: handle i18n
|
2026-02-11 15:14:31 +08:00 |
|
|
|
c2fb3604de
|
feat: can show add files
|
2026-02-11 14:58:53 +08:00 |
|
|
|
fff2c11d9c
|
refactor(web): remove LLM reasoning format config and clean up locale strings
|
2026-02-09 23:57:27 +08:00 |
|
|
|
ca243d7efc
|
chore(web): pre-align HITL frontend from build/feat/hitl
|
2026-02-09 15:34:15 +08:00 |
|
|
|
a1fc280102
|
feat: Human Input Node (#32060)
The frontend and backend implementation for the human input node.
Co-authored-by: twwu <twwu@dify.ai>
Co-authored-by: JzoNg <jzongcode@gmail.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
Co-authored-by: zhsama <torvalds@linux.do>
|
2026-02-09 14:57:23 +08:00 |
|
|
|
70c887ed5c
|
fix undo/redo
|
2026-02-03 18:00:06 +08:00 |
|
|
|
90fe9abab7
|
revert: revert human input relevant code (#31766)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-01-30 19:18:49 +08:00 |
|
|
|
cf7fae393c
|
chore(i18n): sync translations with en-US (#31730)
Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com>
Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
|
2026-01-30 12:27:01 +08:00 |
|
|
|
26dd6c128c
|
feat: mouse right click can add new comment
|
2026-01-29 09:13:12 +08:00 |
|
|
|
135fc45ae9
|
Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox
|
2026-01-28 17:50:58 +08:00 |
|
|
|
e98c1adfbf
|
chore(i18n): sync translations with en-US (#31630)
Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
|
2026-01-28 17:49:10 +08:00 |
|
|
|
2e954388f5
|
merge
|
2026-01-26 16:57:45 +08:00 |
|
|
|
dd988d42c2
|
feat: enhance quota panel to support additional model providers and integrate trial models feature (#31443)
Co-authored-by: CodingOnStar <hanxujiang@dify.ai>
|
2026-01-26 14:04:12 +08:00 |
|
|
|
4c596aaac2
|
Merge branch 'feat/collaboration2' into feat/support-agent-sandbox
|
2026-01-25 00:00:03 +08:00 |
|
|
|
edb4457684
|
Merge remote-tracking branch 'myori/main' into feat/collaboration2
|
2026-01-24 15:22:07 +08:00 |
|
|
|
a522327662
|
chore: i18n
|
2026-01-23 14:33:17 +08:00 |
|
|
|
e105dc6289
|
new restore
|
2026-01-23 14:22:58 +08:00 |
|
|
|
356a156f36
|
chore(i18n): sync translations with en-US (#31413)
Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com>
Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
|
2026-01-22 20:56:19 +08:00 |
|
|
|
b9f718005c
|
feat: frontend part of support try apps (#31287)
Co-authored-by: CodingOnStar <hanxujiang@dify.ai>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
|
2026-01-22 18:16:37 +08:00 |
|
|
|
117b6c65e4
|
chore(i18n): sync translations with en-US (#31342)
Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com>
Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
|
2026-01-21 16:35:12 +08:00 |
|
|
|
146ee4d3e9
|
chore(i18n): sync translations with en-US (#31332)
Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
|
2026-01-21 16:15:58 +08:00 |
|
|
|
db4fb06c5f
|
chore: lint custom tag in i18n (#31301)
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
|
2026-01-21 12:21:30 +08:00 |
|
|
|
8f949d503a
|
chore(i18n): sync translations with en-US (#31298)
Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com>
Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
|
2026-01-20 21:40:43 +08:00 |
|
|
|
3bb80a0934
|
chore: lint for i18n place holder (#31283)
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
|
2026-01-20 21:14:20 +08:00 |
|
|
|
cb51a449d3
|
fix: correct i18n for stepOne.uploader.tip (#31177)
|
2026-01-20 09:30:50 +08:00 |
|
|
|
c45fbb6491
|
rm workflow.ts
|
2026-01-17 10:26:12 +08:00 |
|
|
|
fc291e4ca2
|
Merge remote-tracking branch 'myori/main' into feat/collaboration2
|
2026-01-17 10:22:41 +08:00 |
|
|
|
5ad2385799
|
chore(i18n): sync translations with en-US (#30750)
Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com>
|
2026-01-08 22:53:04 +08:00 |
|
|
|
a72044aa86
|
chore: fix lint in i18n (#30571)
|
2026-01-05 16:12:12 +08:00 |
|
|
|
151101aaf5
|
chore(i18n): translate i18n files based on en-US changes (#30508)
Co-authored-by: hyoban <38493346+hyoban@users.noreply.github.com>
|
2026-01-04 17:11:40 +08:00 |
|
|
|
8129b04143
|
fix(web): enable JSON_OBJECT type support in console UI (#30412)
Co-authored-by: zhsama <torvalds@linux.do>
|
2025-12-31 13:38:16 +08:00 |
|
|
|
20944e7e1a
|
chore: i18n namespace refactor in package.json and add missing translations (#30324)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
|
2025-12-29 20:59:11 +08:00 |
|
|
|
6d0e36479b
|
refactor(i18n): use JSON with flattened key and namespace (#30114)
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2025-12-29 14:52:32 +08:00 |
|
|
|
eb73f9a9b9
|
chore: no template string in translation (#30101)
|
2025-12-24 17:17:36 +08:00 |
|
|
|
80f11471ae
|
perf: improve Jest caching and configuration in web tests (#29881)
|
2025-12-19 12:00:46 +08:00 |
|
