Commits · ef2eb65f8ebe67165715c66e4a9c1285cdcdd50a · alpha / physical

18 Apr, 2019 1 commit
- fix bug · ef2eb65f
  Kai authored Apr 18, 2019
  
  ef2eb65f
17 Apr, 2019 14 commits
- Merge branch 'master' of git.wanmeizhensuo.com:alpha/physical · 8c2407af
  段英荣 authored Apr 17, 2019
  
  8c2407af
- add content_level 6 · 44b6862d
  段英荣 authored Apr 17, 2019
  
  44b6862d
- Merge branch 'master' of git.wanmeizhensuo.com:alpha/physical · 0d5705e1
  Kai authored Apr 17, 2019
  
  0d5705e1
- fix bug · b6f843f4
  Kai authored Apr 17, 2019
  
  b6f843f4
- Merge branch 'hk' into 'master' · 80a32c42
  黄凯 authored Apr 17, 2019
```
linucb collection tag

See merge request alpha/physical!281
```
  80a32c42
- update · fc99626e
  Kai authored Apr 17, 2019
  
  fc99626e
- Merge branch 'master' into hk · 2e3647e1
  Kai authored Apr 17, 2019
  
  2e3647e1
- update · f164bb6c
  Kai authored Apr 17, 2019
  
  f164bb6c
- add es_type attention_user_tag · 76379c4c
  段英荣 authored Apr 17, 2019
  
  76379c4c
- modify bug · 4bd61032
  段英荣 authored Apr 17, 2019
  
  4bd61032
- modify linucb bug · d54d5d2d
  段英荣 authored Apr 17, 2019
  
  d54d5d2d
- modify bug · 2603258f
  段英荣 authored Apr 17, 2019
  
  2603258f
- modify · 2fa936ff
  段英荣 authored Apr 17, 2019
  
  2fa936ff
- modify bug · 190f15d4
  段英荣 authored Apr 17, 2019
  
  190f15d4
16 Apr, 2019 25 commits
- modify bug · adef298a
  段英荣 authored Apr 16, 2019
  
  adef298a
- Merge branch 'master' of git.wanmeizhensuo.com:alpha/physical · 650e4485
  段英荣 authored Apr 16, 2019
  
  650e4485
- modify bug · 2961e537
  段英荣 authored Apr 16, 2019
  
  2961e537
- Merge branch 'hk_now' into 'master' · c1331790
  黄凯 authored Apr 16, 2019
```
add promote topic filter

See merge request alpha/physical!279
```
  c1331790
- Merge branch 'master' of git.wanmeizhensuo.com:alpha/physical · 51f12f10
  Kai authored Apr 16, 2019
  
  51f12f10
- filter promote topic · ff1f096e
  Kai authored Apr 16, 2019
  
  ff1f096e
- Merge branch 'master' of git.wanmeizhensuo.com:alpha/physical · 79ecf29a
  段英荣 authored Apr 16, 2019
  
  79ecf29a
- add choice_push_tag · 1caa9200
  段英荣 authored Apr 16, 2019
  
  1caa9200
- update · ae984dff
  Kai authored Apr 16, 2019
  
  ae984dff
- Merge branch 'master' of git.wanmeizhensuo.com:alpha/physical · a266d0f5
  Kai authored Apr 16, 2019
  
  a266d0f5
- update · 02fc1059
  Kai authored Apr 16, 2019
  
  02fc1059
- Merge branch 'hk' into 'master' · 4bedfc6f
  黄凯 authored Apr 16, 2019
```
add promote position

See merge request alpha/physical!277
```
  4bedfc6f
- Merge branch 'master' into 'hk' · a3fc2e44
  黄凯 authored Apr 16, 2019
```
# Conflicts:
#   search/views/topic.py
```
  a3fc2e44
- Merge branch 'master' of git.wanmeizhensuo.com:alpha/physical · 89c7d33a
  Kai authored Apr 16, 2019
  
  89c7d33a
- Merge branch 'create' into 'master' · 51ac68cd
  段英荣 authored Apr 16, 2019
```
add

See merge request !276
```
  51ac68cd
- add · 0b460fd5
  lixiaofang authored Apr 16, 2019
  
  0b460fd5
- Merge branch 'hk_now' into 'master' · 5ce2e3a4
  黄凯 authored Apr 16, 2019
```
revise attention_tag_list weight to 100

See merge request alpha/physical!273
```
  5ce2e3a4
- revise attention_tag_list weight to 100 · d433a343
  Kai authored Apr 16, 2019
  
  d433a343
- revise attention_tag_list weight · 50cf4732
  Kai authored Apr 16, 2019
  
  50cf4732
- add promote topic position · ea9ac0aa
  Kai authored Apr 16, 2019
  
  ea9ac0aa
- add promote topic position · 3b0aa68d
  Kai authored Apr 16, 2019
  
  3b0aa68d
- Merge branch 'create' into 'master' · 10ced1c0
  段英荣 authored Apr 16, 2019
```
add

See merge request !272
```
  10ced1c0
- add promote topic position · e8f753f0
  Kai authored Apr 16, 2019
  
  e8f753f0
- add promote topic position · 0b39e426
  Kai authored Apr 16, 2019
  
  0b39e426
- add promote topic position · c4f8926a
  Kai authored Apr 16, 2019
  
  c4f8926a