Commits · 2b509f4ebf199cb88dd58ffc8342249749a8281b · alpha / physical

13 Feb, 2019 1 commit
- modify · 2b509f4e
  段英荣 authored Feb 13, 2019
  
  2b509f4e
01 Feb, 2019 3 commits
- Merge branch 'test' into 'dev' · 0afbb89a
  zhanglu authored Feb 01, 2019
```
# Conflicts:
#   physical/settings.py
#   trans2es/models/face_user_contrast_similar.py
```
  0afbb89a
- Merge branch 'master' into 'test' · cffcec45
  zhanglu authored Feb 01, 2019
```
Master

See merge request !99
```
  cffcec45
- fix · 51861b6b
  zhanglu authored Feb 01, 2019
  
  51861b6b
31 Jan, 2019 2 commits
- Merge branch 'master' into 'dev' · 86bce1fc
  zhanglu authored Jan 31, 2019
```
Master

See merge request !97
```
  86bce1fc
- Merge branch 'duanyr' into 'dev' · e714e2f0
  王浩 authored Jan 31, 2019
```
Duanyr

See merge request !96
```
  e714e2f0
30 Jan, 2019 7 commits
- Merge branch 'feature/searth_topic' into 'master' · 2416b4b6
  zhanglu authored Jan 30, 2019
```
帖子添加时间排序

See merge request !93
```
  2416b4b6
- 帖子添加时间排序 · b7bd6186
  zhanglu authored Jan 30, 2019
  
  b7bd6186
- Merge branch 'feature/searth_topic' into 'dev' · c52ecea4
  zhanglu authored Jan 30, 2019
```
帖子添加时间排序

See merge request !92
```
  c52ecea4
- Merge branch 'feature/searth_topic' into 'master' · bf09f5e1
  zhanglu authored Jan 30, 2019
```
帖子添加时间排序

See merge request !91
```
  bf09f5e1
- 帖子添加时间排序 · 68ddb4eb
  zhanglu authored Jan 30, 2019
  
  68ddb4eb
- Update es.py · 9204b809
  段英荣 authored Jan 30, 2019
  
  9204b809
- Merge branch 'feature/searth_topic' into 'master' · 53d05f07
  zhanglu authored Jan 30, 2019
```
Feature/searth topic

See merge request !90
```
  53d05f07
29 Jan, 2019 9 commits
- Merge branch 'feature/searth_topic' into 'dev' · d9836e35
  zhanglu authored Jan 29, 2019
```
Feature/searth topic

See merge request !89
```
  d9836e35
- fix · 0dc34b1f
  zhanglu authored Jan 29, 2019
  
  0dc34b1f
- rm pyc · 4250a56c
  zhanglu authored Jan 29, 2019
  
  4250a56c
- Merge branch 'feature/searth_topic' into 'dev' · 9d0d8d3b
  zhanglu authored Jan 29, 2019
```
Feature/searth topic

See merge request !88
```
  9d0d8d3b
- Merge branch 'dev' into 'feature/searth_topic' · 8a9e2f5c
  zhanglu authored Jan 29, 2019
```
# Conflicts:
#   search/views/topic.py
```
  8a9e2f5c
- 帖子搜索 · 3d8b104e
  zhanglu authored Jan 29, 2019
  
  3d8b104e
- Merge branch 'master' into 'dev' · e07e2a14
  zhanglu authored Jan 29, 2019
```
Master

See merge request !87
```
  e07e2a14
- gitignore · a15b85c7
  zhanglu authored Jan 29, 2019
  
  a15b85c7
- add query_topic_by_user_similarity · 90f98311
  段英荣 authored Jan 29, 2019
  
  90f98311
28 Jan, 2019 2 commits
- Merge branch 'dev' into 'master' · 143d8b6f
  段英荣 authored Jan 28, 2019
```
modify include to includes

See merge request !86
```
  143d8b6f
- modify include to includes · f3b78a5d
  段英荣 authored Jan 28, 2019
  
  f3b78a5d
27 Jan, 2019 6 commits
- Merge branch 'dev' into 'master' · a5a48ebd
  段英荣 authored Jan 27, 2019
```
modify expire time

See merge request !85
```
  a5a48ebd
- modify expire time · ba349772
  段英荣 authored Jan 27, 2019
  
  ba349772
- Merge branch 'dev' into 'master' · d194ce29
  段英荣 authored Jan 26, 2019
```
modify home_recommend score

See merge request !84
```
  d194ce29
- modify home_recommend score · 77641c72
  段英荣 authored Jan 26, 2019
  
  77641c72
- Merge branch 'dev' into 'master' · c09ccae9
  段英荣 authored Jan 26, 2019
```
modify home_recommend score

See merge request !83
```
  c09ccae9
- modify home_recommend score · 01428384
  段英荣 authored Jan 26, 2019
  
  01428384
26 Jan, 2019 7 commits
- Merge branch 'dev' into 'master' · 196829e9
  段英荣 authored Jan 26, 2019
```
modify home_recommend score

See merge request !82
```
  196829e9
- modify home_recommend score · ff118e24
  段英荣 authored Jan 26, 2019
  
  ff118e24
- Merge branch 'dev' into 'master' · 8b9baf8b
  段英荣 authored Jan 26, 2019
```
modify home_recommend score

See merge request !81
```
  8b9baf8b
- modify home_recommend score · 6a469613
  段英荣 authored Jan 26, 2019
  
  6a469613
- Merge branch 'dev' into 'master' · 35af76f3
  段英荣 authored Jan 26, 2019
```
Dev

See merge request !80
```
  35af76f3
- Merge branch 'dev' of git.wanmeizhensuo.com:alpha/physical into dev · f14af62c
  段英荣 authored Jan 26, 2019
  
  f14af62c
- add create_time factor on home_recommend · 3227a57a
  段英荣 authored Jan 26, 2019
  
  3227a57a
25 Jan, 2019 3 commits
- Merge branch 'master' into 'dev' · c8f707dd
  zhanglu authored Jan 25, 2019
```
Master

See merge request !78
```
  c8f707dd
- update dict name · 764d48f3
  lixiaofang authored Jan 25, 2019
  
  764d48f3
- update dict name · 37e87a92
  lixiaofang authored Jan 25, 2019
  
  37e87a92