opensource
/
dify
mirror of https://github.com/langgenius/dify.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,030 Commits 290 Branches 160 Tags 499 MiB
Commit Graph

791 Commits

Author SHA1 Message Date
CodingOnStar 3d3e09d54d Merge branch 'feat/gtag-1016' into deploy/dev 2025-10-17 13:38:38 +08:00
Stream 946f0b00e4
Merge remote-tracking branch 'origin/deploy/dev' into deploy/dev 2025-10-15 17:20:14 +08:00
Stream b1a8db77db
Merge branch 'feat/memory-orchestration-be-dev-env' into deploy/dev 2025-10-15 17:19:43 +08:00
Stream 106f0fba0b
Merge branch 'feat/memory-orchestration-be' into feat/memory-orchestration-be-dev-env 
# Conflicts:
#	api/controllers/console/app/workflow.py
#	api/services/workflow_service.py
 2025-10-15 17:00:15 +08:00
Stream cb73335599
chore: run ruff 2025-10-15 16:57:18 +08:00
Stream f4fa57dac9
fix: store memory_blocks in correct field 2025-10-15 16:56:12 +08:00
Novice df1859f6b8
Merge branch 'feat/mcp-06-18' into deploy/dev 2025-10-15 15:32:00 +08:00
Novice b6b1140a21
fix: handle authorization field 2025-10-15 15:31:30 +08:00
Novice a12350f0a0
Merge branch 'feat/mcp-06-18' into deploy/dev 2025-10-15 15:06:32 +08:00
Stream 8555dd8154
Merge branch 'feat/memory-orchestration-be-dev-env' into deploy/dev 2025-10-15 14:44:16 +08:00
Stream 06f364f2c8
Merge branch 'feat/memory-orchestration-be' into feat/memory-orchestration-be-dev-env 2025-10-15 14:43:45 +08:00
Novice 979d35d87f
feat: encrypt user's client secret 2025-10-15 14:40:14 +08:00
Stream 7ca06931ec
fix: unify memory variable in VariablePool 2025-10-15 14:39:05 +08:00
Ademílson Tonato a16ef7e73c
refactor: Update Firecrawl to use v2 API (#24734) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2025-10-15 10:48:54 +08:00
Novice 4cb42499ae
Merge branch 'feat/mcp-06-18' into deploy/dev 2025-10-14 21:42:21 +08:00
Novice 7d91f4783b
Merge branch 'main' into feat/mcp-06-18 2025-10-14 20:36:47 +08:00
Novice 5c6a2af448
chore: fix review issues 2025-10-14 20:36:13 +08:00
hj24 15a5ba67f1
fix: use account id in workflow app log filter (#26811) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
 2025-10-14 14:32:40 +08:00
hj24 7a54607219 fix: raise error for unexpected account 2025-10-14 13:35:02 +08:00
XlKsyt 0b35bc1ede
feat: add Tencent Cloud APM tracing integration (#25657) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
 2025-10-14 10:21:17 +08:00
Novice d5a7a537e5
Merge branch 'main' into feat/mcp-06-18 2025-10-14 09:49:06 +08:00
Asuka Minato 0a6b78f883
Use hook to get userid (#26839) 
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
 2025-10-14 09:20:37 +08:00
Novice 0a6da0bf2f
chore: change the field 2025-10-13 18:06:23 +08:00
hj24 ed97dce06e fix: add fast path 2025-10-13 17:20:52 +08:00
hjlarry 064075ab5f Merge branch 'feat/collaboration' into deploy/dev 2025-10-13 16:43:23 +08:00
hj24 b4d412fead fix: ci lint 2025-10-13 14:03:49 +08:00
Novice a538f80e95
Merge branch 'main' into feat/mcp-06-18 2025-10-13 13:54:01 +08:00
lyzno1 67762cf1d8
chore: resolve merge conflict in pnpm-lock.yaml 
Merged origin/main into feat/collaboration and resolved dependency lock file conflicts by regenerating pnpm-lock.yaml through clean install.

Changes:
- Resolved eslint version differences (9.36.0 vs 9.35.0)
- Updated lock file reflects current dependency resolution
- All other changes from main branch successfully merged
 2025-10-13 11:53:43 +08:00
屈定 44d36f2460
fix: external knowledge url check ssrf (#26789) 
Co-authored-by: Asuka Minato <i@asukaminato.eu.org>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
 2025-10-13 11:19:00 +08:00
hj24 b6d9360f72 fix: use account id in workflow app log filter 2025-10-13 10:42:18 +08:00
Asuka Minato 24cd7bbc62
fix RetrievalMethod StrEnum (#26768) 
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
 2025-10-13 10:29:37 +08:00
hjlarry 9fc2a0a3a1 Merge branch 'feat/collaboration' into deploy/dev 2025-10-13 10:16:39 +08:00
Asuka Minato 0a56d65581
Issue 23579 (#26777) 
Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
 2025-10-13 10:16:12 +08:00
Stream ca0a149f06
Merge branch 'feat/memory-orchestration-be-dev-env' into deploy/dev 2025-10-11 16:28:33 +08:00
Stream db83b54a88
Merge branch 'feat/memory-orchestration-be' into feat/memory-orchestration-be-dev-env 2025-10-11 16:27:58 +08:00
Stream f4567fbf9e
fix: fix circular ref 2025-10-11 16:27:40 +08:00
Stream 05751ac492
Merge branch 'feat/memory-orchestration-be-dev-env' into deploy/dev 2025-10-11 16:16:15 +08:00
Stream 1a4600ce77
Merge remote-tracking branch 'origin/deploy/dev' into feat/memory-orchestration-be-dev-env 
# Conflicts:
#	api/models/__init__.py
#	api/uv.lock
 2025-10-11 15:01:26 +08:00
lyzno1 f19630bcf5
Merge remote-tracking branch 'origin/main' into feat/collaboration 2025-10-11 14:43:20 +08:00
Guangdong Liu 456dbfe7d7
feat: add tracking for updated_by and updated_at fields in app models (#26736) 2025-10-11 13:48:57 +08:00
Yansong Zhang d0b99170f6 mr credit pool 2025-10-11 11:48:54 +08:00
Yansong Zhang 1d16528dff add credit next_credit_reset_date 2025-10-11 11:45:24 +08:00
Yansong Zhang c0ed353c10 add credit next_credit_reset_date 2025-10-11 11:45:18 +08:00
Yansong Zhang 26b63693aa Separate object attributes before session 2025-10-11 09:54:20 +08:00
Yansong Zhang 5883dc8876 fix: session of db 2025-10-11 09:42:41 +08:00
Yansong Zhang 3e14077e8d fix trial where condition 2025-10-11 09:27:06 +08:00
Asuka Minato 1bd621f819
remove .value (#26633) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
 2025-10-11 09:08:29 +08:00
Asuka Minato bb6a331490
change all to httpx (#26119) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
 2025-10-10 23:41:16 +08:00
Stream f6038a4557
Merge branch 'main' into feat/memory-orchestration-be 2025-10-10 18:43:59 +08:00
Asuka Minato ab2eacb6c1
use model_validate (#26182) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
 2025-10-10 17:30:13 +09:00