Commits · da3707a54b9ce566677596f919debd2016a622da · alpha / sun

08 Aug, 2019 1 commit
- fix code · da3707a5
  haowang authored Aug 08, 2019
  
  da3707a5
07 Aug, 2019 5 commits
- fix code · a395e744
  haowang authored Aug 07, 2019
  
  a395e744
- fix code · 970f0876
  haowang authored Aug 07, 2019
  
  970f0876
- fix code · 4bfd5938
  haowang authored Aug 07, 2019
  
  4bfd5938
- fix code · dedc177b
  haowang authored Aug 07, 2019
  
  dedc177b
- fix code · 689498c1
  haowang authored Aug 07, 2019
  
  689498c1
06 Aug, 2019 13 commits
- Merge branch 'haow/dev' into 'test' · 264b8bd2
  王浩 authored Aug 06, 2019
```
fix code

See merge request !286
```
  264b8bd2
- Merge branch 'test' into 'haow/dev' · 0c6dda63
  王浩 authored Aug 06, 2019
```
# Conflicts:
#   api/reply.py
#   api/urls.py
```
  0c6dda63
- fix code · 0b99b3b6
  haowang authored Aug 06, 2019
  
  0b99b3b6
- fix code · bd45a607
  haowang authored Aug 06, 2019
  
  bd45a607
- fix code · 0e0c50c9
  haowang authored Aug 06, 2019
  
  0e0c50c9
- Merge branch 'ycl/fix_dev' into 'test' · 366981c5
  杨成林 authored Aug 06, 2019
```
Ycl/fix dev

See merge request !285
```
  366981c5
- conflict · c779b1ee
  yangchenglin authored Aug 06, 2019
  
  c779b1ee
- conflict · 48082baf
  yangchenglin authored Aug 06, 2019
  
  48082baf
- Merge branch 'ycl/fix_dev' into 'dev' · ea2b8254
  杨成林 authored Aug 06, 2019
```
fix

See merge request !284
```
  ea2b8254
- fix · f594dc94
  yangchenglin authored Aug 06, 2019
  
  f594dc94
- Merge branch 'ycl/fix_dev' into 'dev' · 1c4922c8
  杨成林 authored Aug 06, 2019
```
reply vote

See merge request !283
```
  1c4922c8
- reply vote · ef142bd0
  yangchenglin authored Aug 06, 2019
  
  ef142bd0
- Merge branch 'master' of http://git.wanmeizhensuo.com/alpha/sun into haow/dev · e0d18329
  haowang authored Aug 06, 2019
  
  e0d18329
05 Aug, 2019 2 commits
- fix code · db396e88
  haowang authored Aug 05, 2019
  
  db396e88
- Merge branch 'haow/dev' into 'test' · 65af1022
  王浩 authored Aug 05, 2019
```
fix code

See merge request !282
```
  65af1022
02 Aug, 2019 4 commits
- add reply api · 11b6267d
  haowang authored Aug 02, 2019
  
  11b6267d
- Merge branch 'haow/dev' into 'test' · 112c30cd
  王浩 authored Aug 02, 2019
```
add reply api

See merge request !281
```
  112c30cd
- Merge branch 'ycl/fix_dev' into 'dev' · 64ff09c5
  杨成林 authored Aug 02, 2019
```
pictorial_reply

See merge request !280
```
  64ff09c5
- pictorial_reply · 0b328dc2
  yangchenglin authored Aug 02, 2019
  
  0b328dc2
01 Aug, 2019 2 commits
- add is_kol in user info · 11397161
  haowang authored Aug 01, 2019
  
  11397161
- Merge branch 'haow/dev' into 'test' · 725ee1f3
  王浩 authored Aug 01, 2019
```
add is_kol in user info

See merge request !279
```
  725ee1f3
31 Jul, 2019 2 commits
- Merge branch 'ycl/fix_dev' into 'dev' · f73b4b0f
  杨成林 authored Jul 31, 2019
```
Ycl/fix dev

See merge request !278
```
  f73b4b0f
- conflict · d1646d6b
  yangchenglin authored Jul 31, 2019
  
  d1646d6b
30 Jul, 2019 3 commits
- Merge branch 'test' into 'master' · 31260d9d
  王浩 authored Jul 30, 2019
```
Alpha 2.1

See merge request !276
```
  31260d9d
- Merge branch 'ycl/fix' into 'test' · 8002e667
  杨成林 authored Jul 30, 2019
```
fix

See merge request !277
```
  8002e667
- fix · 8a771c68
  yangchenglin authored Jul 30, 2019
  
  8a771c68
29 Jul, 2019 2 commits
- add product list sorted condition · b000aa08
  haowang authored Jul 29, 2019
  
  b000aa08
- Merge branch 'haow/dev' into 'test' · dfbd50df
  王浩 authored Jul 29, 2019
```
add product list sorted condition

See merge request !275
```
  dfbd50df
25 Jul, 2019 2 commits
- Merge branch 'ycl/fix' into 'test' · b4768434
  杨成林 authored Jul 25, 2019
```
fix

See merge request !274
```
  b4768434
- fix · e5277184
  yangchenglin authored Jul 25, 2019
  
  e5277184
24 Jul, 2019 4 commits
- Merge branch 'ycl/fix' into 'test' · 806e1e44
  杨成林 authored Jul 24, 2019
```
add pictoria search

See merge request !273
```
  806e1e44
- add pictoria search · 6997c166
  yangchenglin authored Jul 24, 2019
  
  6997c166
- Merge branch 'ycl/fix' into 'test' · b11fdcce
  杨成林 authored Jul 24, 2019
```
fix

See merge request !272
```
  b11fdcce
- fix · 4c0d5856
  yangchenglin authored Jul 24, 2019
  
  4c0d5856