Commits · 67b76f80126d680a9fb3b74bc5cf5f6da0f6525a · ai-tech / dify

27 Jun, 2023 39 commits
- Merge branch 'feat/conversation-pin-op' into deploy/dev · 67b76f80
  Joel authored Jun 27, 2023
  
  67b76f80
- Merge branch 'main' into feat/conversation-pin-op · 3580c91b
  Joel authored Jun 27, 2023
  
  3580c91b
- chore: reset test paging · 77f4ca16
  Joel authored Jun 27, 2023
  
  77f4ca16
- Feat/refact header (#468) · 1226d731
  zxhlyh authored Jun 27, 2023
  
  1226d731
- 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
- Merge branch 'main' into feat/conversation-pin-op · a5d73a86
  Joel authored Jun 27, 2023
  
  a5d73a86
- fix datatime filed · 5c2d4403
  jyong authored Jun 27, 2023
  
  5c2d4403
- fix: new conversatino not set right name · 21330a41
  Joel authored Jun 27, 2023
  
  21330a41
- 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: two list scroll ui · c00e9608
  Joel authored Jun 27, 2023
  
  c00e9608
- Fix/json format (#465) · c67ecff3
  Jyong authored Jun 27, 2023
  
  c67ecff3
- fix: missing vars bind · 2c016606
  Joel authored Jun 27, 2023
  
  2c016606
- feat: i18n and success notify · 3df562d0
  Joel authored Jun 27, 2023
  
  3df562d0
- 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: converation pin and unpin almost done · 04abd4b5
  Joel authored Jun 27, 2023
  
  04abd4b5
- 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 1 commit
- Feat/add icons (#450) · 17d19612
  zxhlyh authored Jun 26, 2023
  
  17d19612