Commits · 9de6fe96193495cbcfdaf17e4b7ce31fdc682cb6 · 谢林臻 / sun

24 Dec, 2018 5 commits
- Merge branch 'xujunpeng/feature' into 'dev' · 9de6fe96
  许俊鹏 authored Dec 24, 2018
```
增加build文件

See merge request alpha/sun!37
```
  9de6fe96
- 增加build文件 · 703f5c40
  许俊鹏 authored Dec 24, 2018
  
  703f5c40
- Merge branch 'xujunpeng/feature' into 'dev' · f8c6d8b0
  许俊鹏 authored Dec 24, 2018
```
Xujunpeng/feature

See merge request alpha/sun!36
```
  f8c6d8b0
- 处理冲突 · be347bf7
  许俊鹏 authored Dec 24, 2018
  
  be347bf7
- 邀请文案后台配置 · 5c421f29
  许俊鹏 authored Dec 24, 2018
  
  5c421f29
19 Dec, 2018 9 commits
- Merge branch 'feature/star_uv' into 'master' · 4cf6852a
  zhanglu authored Dec 19, 2018
```
上传uv图

See merge request alpha/sun!35
```
  4cf6852a
- build · c22c91d5
  zhanglu authored Dec 19, 2018
  
  c22c91d5
- 上传uv图 · 882a481b
  zhanglu authored Dec 19, 2018
  
  882a481b
- run build · aa085840
  Davve authored Dec 19, 2018
  
  aa085840
- 增加标签类型过滤和标签图片 · 7972f2e6
  Davve authored Dec 19, 2018
  
  7972f2e6
- Merge branch 'hotfix/check_domain' into 'master' · fb022b97
  zhanglu authored Dec 19, 2018
```
Hotfix/check domain

See merge request alpha/sun!33
```
  fb022b97
- run build · a67122a3
  Davve authored Dec 19, 2018
  
  a67122a3
- run build · 2ba2df0b
  Davve authored Dec 19, 2018
  
  2ba2df0b
- 切换视频域名 · eb0a0e2e
  Davve authored Dec 19, 2018
  
  eb0a0e2e
18 Dec, 2018 3 commits
- Merge branch 'hotfix/uneditable_account' into 'master' · 17698120
  zhanglu authored Dec 18, 2018
```
Hotfix/uneditable account

See merge request alpha/sun!32
```
  17698120
- run build · 511d2979
  Davve authored Dec 18, 2018
  
  511d2979
- 账号不可编辑 · 6e22e34c
  Davve authored Dec 18, 2018
  
  6e22e34c
17 Dec, 2018 7 commits
- 增加标签类型 · 32da8b8f
  Davve authored Dec 17, 2018
  
  32da8b8f
- 增加标签类型 · ca033122
  Davve authored Dec 17, 2018
  
  ca033122
- Merge branch 'master' into dev · cf0a6d09
  Davve authored Dec 17, 2018
  
  cf0a6d09
- Merge branch 'fix/watch_video_time' into 'master' · 62f313f5
  zhanglu authored Dec 17, 2018
```
Fix/watch video time

See merge request alpha/sun!31
```
  62f313f5
- Merge branch 'fix/watch_video_time' into dev · fe62c357
  Davve authored Dec 17, 2018
  
  fe62c357
- run bild · 38d9e669
  Davve authored Dec 17, 2018
  
  38d9e669
- 修改帖子视频上传时长限制 · 54171e7a
  Davve authored Dec 17, 2018
  
  54171e7a
13 Dec, 2018 4 commits
- Merge branch 'build' into 'master' · cdbce727
  zhanglu authored Dec 13, 2018
```
settings_local

See merge request alpha/sun!30
```
  cdbce727
- settings_local · d405f07c
  zhanglu authored Dec 13, 2018
  
  d405f07c
- Merge branch 'build' into 'master' · 16255e87
  zhanglu authored Dec 13, 2018
```
Build

See merge request alpha/sun!29
```
  16255e87
- Merge branch 'dev' · f44616ca
  zhanglu authored Dec 13, 2018
  
  f44616ca
12 Dec, 2018 12 commits
- fix rpc router · 7d605184
  JackieZhang authored Dec 12, 2018
  
  7d605184
- build · 4f80f9ab
  zhanglu authored Dec 12, 2018
  
  4f80f9ab
- 模型可不传 · 76680cf8
  zhanglu authored Dec 12, 2018
  
  76680cf8
- Merge branch 'hotfix/video' into 'master' · 3b3fb394
  zhanglu authored Dec 12, 2018
```
Hotfix/video

See merge request alpha/sun!27
```
  3b3fb394
- run build · 6264a024
  Davve authored Dec 12, 2018
  
  6264a024
- 切换视频上传 · 69c37e07
  Davve authored Dec 12, 2018
  
  69c37e07
- 切换视频上传 · 85a3ba21
  Davve authored Dec 12, 2018
  
  85a3ba21
- Merge branch 'fix/gender' into 'master' · 93015ed2
  zhanglu authored Dec 12, 2018
```
Fix/gender

See merge request alpha/sun!26
```
  93015ed2
- run build · 7bf3e49d
  Davve authored Dec 12, 2018
  
  7bf3e49d
- 修改性别回填 · 0e2094dd
  Davve authored Dec 12, 2018
  
  0e2094dd
- Merge branch 'feature/face_image_upload' into 'master' · b125bb9d
  zhanglu authored Dec 12, 2018
```
Feature/face image upload

See merge request alpha/sun!25
```
  b125bb9d
- run build · 0a472365
  Davve authored Dec 12, 2018
  
  0a472365