Commits · c5d62b883816d42ead41065cac729ba53f1958ab · ai-tech / dify

27 Jun, 2023 29 commits
- Merge branch 'fix/json-format' into deploy/dev · c5d62b88
  jyong authored Jun 27, 2023
  
  c5d62b88
- Merge branch 'main' into fix/json-format · a192ec73
  jyong authored Jun 27, 2023
```
# Conflicts:
#	api/core/data_loader/loader/excel.py
#	api/core/data_loader/loader/notion.py
```
  a192ec73
- fix datatime filed · 5c2d4403
  jyong authored Jun 27, 2023
  
  5c2d4403
- Merge branch 'feat/refact-header' into deploy/dev · 2c2c3892
  StyleZhang authored Jun 27, 2023
  
  2c2c3892
- fix: create app & dataset in nav · fd018586
  StyleZhang authored Jun 27, 2023
  
  fd018586
- Fix/json format (#465) · c67ecff3
  Jyong authored Jun 27, 2023
  
  c67ecff3
- fix: template parse error when history include {{any}} (#463) · d5b42c09
  John Wang authored Jun 27, 2023
  
  d5b42c09
- Merge branch 'fix/json-format' into deploy/dev · a9622894
  jyong authored Jun 27, 2023
  
  a9622894
- fix datatime filed · ce4dbe6e
  jyong authored Jun 27, 2023
  
  ce4dbe6e
- Merge branch 'fix/json-format' into deploy/dev · 81a31a09
  jyong authored Jun 27, 2023
```
# Conflicts:
#	api/core/prompt/prompt_template.py
```
  81a31a09
- json format · 08499480
  jyong authored Jun 27, 2023
  
  08499480
- fix: template parse error when pre prompt include {{}} (#462) · 835bf9fd
  John Wang authored Jun 27, 2023
  
  835bf9fd
- feat: optimize template parse (#460) · c720f831
  John Wang authored Jun 27, 2023
  
  c720f831
- Merge branch 'feat/optimize-template-parse' into deploy/dev · 04d7e0a8
  John Wang authored Jun 27, 2023
  
  04d7e0a8
- fix: parse error in chat history · f16c8135
  John Wang authored Jun 27, 2023
  
  f16c8135
- Merge branch 'feat/optimize-template-parse' into deploy/dev · b7b16664
  John Wang authored Jun 27, 2023
  
  b7b16664
- feat: optimize template parse · 3f247ef2
  John Wang authored Jun 27, 2023
  
  3f247ef2
- Merge branch 'feat/refact-header' into deploy/dev · e3f2d766
  StyleZhang authored Jun 27, 2023
  
  e3f2d766
- fix: delete useless code · ff7f161a
  StyleZhang authored Jun 27, 2023
  
  ff7f161a
- Merge branch 'feat/refact-header' into deploy/dev · ec6b66a5
  StyleZhang authored Jun 27, 2023
  
  ec6b66a5
- feat: refact header nav · b23fb2c8
  StyleZhang authored Jun 27, 2023
  
  b23fb2c8
- feat: optimize openai error raise (#459) · df5763be
  John Wang authored Jun 27, 2023
  
  df5763be
- Merge branch 'main' into feat/refact-header · 45d8a97a
  StyleZhang authored Jun 27, 2023
  
  45d8a97a
- feat: upgrade nextjs version (#457) · 80eebc24
  zxhlyh authored Jun 27, 2023
  
  80eebc24
- Merge branch 'feat/upgrade-nextjs-version' into deploy/dev · e9fdc7a0
  StyleZhang authored Jun 27, 2023
  
  e9fdc7a0
- fix: document detail link · 5667bd51
  StyleZhang authored Jun 27, 2023
  
  5667bd51
- Merge branch 'feat/upgrade-nextjs-version' into deploy/dev · 0159cdc0
  StyleZhang authored Jun 27, 2023
  
  0159cdc0
- feat: upgrade nextjs version · 25451bec
  StyleZhang authored Jun 27, 2023
  
  25451bec
- feat: refact nav · ecc2ffda
  StyleZhang authored Jun 27, 2023
  
  ecc2ffda
26 Jun, 2023 5 commits
- Feat/add icons (#450) · 17d19612
  zxhlyh authored Jun 26, 2023
  
  17d19612
- fix: hove x scroll shake (#449) · addf150a
  Joel authored Jun 26, 2023
  
  addf150a
- Merge branch 'feat/add-icons' into deploy/dev · b3e3a987
  StyleZhang authored Jun 26, 2023
  
  b3e3a987
- feat: merge · cefc5ae1
  Joel authored Jun 26, 2023
  
  cefc5ae1
- fix: hove x scroll shake · 32ef9c89
  Joel authored Jun 26, 2023
  
  32ef9c89
25 Jun, 2023 6 commits
- fix: icon file name · a5e07878
  StyleZhang authored Jun 25, 2023
  
  a5e07878
- feat: optimize index_struct copy (#442) · cad1532f
  John Wang authored Jun 25, 2023
  
  cad1532f
- Merge branch 'main' into feat/add-icons · eea011bd
  StyleZhang authored Jun 25, 2023
  
  eea011bd
- feat: add icons · 3eb8e66b
  StyleZhang authored Jun 25, 2023
  
  3eb8e66b
- feat: optimize weaviate error msg (#441) · 951afcaa
  John Wang authored Jun 25, 2023
  
  951afcaa
- feat: upgrade langchain (#430) · 3241e401
  John Wang authored Jun 25, 2023
```
Co-authored-by: jyong <718720800@qq.com>
```
  3241e401