Commits · 4e4e304b4d89a3f27c33948937f49e1f804af45d · ai-tech / dify

27 Jun, 2023 40 commits
- chore: cleanup return · 4e4e304b
  crazywoola authored Jun 27, 2023
  
  4e4e304b
- Merge branch 'feature/add_is_deleted_to_conversations' into deploy/dev · 58553d85
  crazywoola authored Jun 27, 2023
  
  58553d85
- feat: add missing convs · 71474991
  crazywoola authored Jun 27, 2023
  
  71474991
- fix: conflict endpoint · c49b9daf
  crazywoola authored Jun 27, 2023
  
  c49b9daf
- add: is_deleted to get query · b875a31d
  crazywoola authored Jun 27, 2023
  
  b875a31d
- feat: add delete api to service · 60cc9986
  crazywoola authored Jun 27, 2023
  
  60cc9986
- feat: modify delete in concole api · 6e3ffc25
  crazywoola authored Jun 27, 2023
  
  6e3ffc25
- feat: modify delete in web api · deb21ed9
  crazywoola authored Jun 27, 2023
  
  deb21ed9
- feat: add delete api to console · 24672492
  crazywoola authored Jun 27, 2023
  
  24672492
- Merge branch 'feat/conversation-pin-op' into deploy/dev · 8b6c0e36
  Joel authored Jun 27, 2023
  
  8b6c0e36
- Merge branch 'main' into feat/conversation-pin-op · 5e4689f7
  Joel authored Jun 27, 2023
  
  5e4689f7
- fix: app nav call detail match explore app detail page (#469) · 0462f09e
  Joel authored Jun 27, 2023
  
  0462f09e
- 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