Commits · 12de84cd3e20e47e487c6f9e1cd4e91dc71ee765 · alpha / sun

13 Mar, 2019 4 commits
- Merge branch 'revert-888a6037' into 'master' · 12de84cd
  zhanglu authored Mar 13, 2019
```
Revert "Merge branch 'feature/channel_package_zy' into 'master'"

See merge request !96
```
  12de84cd
- Revert "Merge branch 'feature/channel_package_zy' into 'master'" · 3e1e9125
  zhanglu authored Mar 13, 2019
```
This reverts merge request !95
```
  3e1e9125
- Merge branch 'feature/channel_package_zy' into 'master' · 888a6037
  王浩 authored Mar 13, 2019
```
更新依赖

See merge request !95
```
  888a6037
- 更新依赖 · d8a5db24
  张永 authored Mar 13, 2019
  
  d8a5db24
09 Mar, 2019 1 commit
- Merge branch 'test' into 'master' · 6ad23941
  王浩 authored Mar 09, 2019
```
1.4 上线

See merge request !93
```
  6ad23941
07 Mar, 2019 4 commits
- Merge branch 'feature/channel_package_zy' into 'test' · 6db8bb0e
  张永 authored Mar 07, 2019
```
修改单个渠道打包条件

See merge request !92
```
  6db8bb0e
- 修改单个渠道打包条件 · 79377283
  张永 authored Mar 07, 2019
  
  79377283
- Merge branch 'feature/channel_package_zy' into 'test' · 1d0032e0
  张永 authored Mar 07, 2019
```
处理下载失败

See merge request !91
```
  1d0032e0
- 处理下载失败 · 7d5ef85b
  张永 authored Mar 07, 2019
  
  7d5ef85b
06 Mar, 2019 3 commits
- Merge branch 'feature/channel_package_zy' into 'test' · 3080ed7b
  zhanglu authored Mar 06, 2019
```
渠道打包

See merge request !74
```
  3080ed7b
- merge master · c98f28bf
  张永 authored Mar 06, 2019
  
  c98f28bf
- 安卓渠道打包D · e4030fe8
  张永 authored Feb 16, 2019
  
  e4030fe8
27 Feb, 2019 1 commit
- Merge branch 'test' into 'master' · 2f3d9ebc
  王浩 authored Feb 27, 2019
```
Test

See merge request !78
```
  2f3d9ebc
26 Feb, 2019 1 commit
- Merge branch 'dev' into 'test' · ca716b5d
  王浩 authored Feb 26, 2019
```
Dev

See merge request !73
```
  ca716b5d
25 Feb, 2019 8 commits
- Merge branch 'haow/dev' into 'dev' · 9d02403e
  王浩 authored Feb 25, 2019
```
fix code

See merge request !72
```
  9d02403e
- fix code · 5f2fd0d6
  王浩 authored Feb 25, 2019
  
  5f2fd0d6
- Merge branch 'haow/dev' into 'dev' · c2d20a55
  王浩 authored Feb 25, 2019
```
fix code

See merge request !71
```
  c2d20a55
- fix code · 034b5515
  王浩 authored Feb 25, 2019
  
  034b5515
- Merge branch 'haow/dev' into 'dev' · c692d01c
  王浩 authored Feb 25, 2019
```
fix code

See merge request !70
```
  c692d01c
- fix code · ac65641d
  王浩 authored Feb 25, 2019
  
  ac65641d
- Merge branch 'haow/dev' into 'dev' · 05a19b1c
  王浩 authored Feb 25, 2019
```
add topic update tag_ids params

See merge request !69
```
  05a19b1c
- add topic update tag_ids params · de6689ba
  王浩 authored Feb 25, 2019
  
  de6689ba
22 Feb, 2019 2 commits
- Merge branch 'haow/dev' into 'dev' · 75c7f1fb
  王浩 authored Feb 22, 2019
```
fix tag info api if id is str

See merge request !68
```
  75c7f1fb
- fix tag info api if id is str · 5546b257
  王浩 authored Feb 22, 2019
  
  5546b257
21 Feb, 2019 8 commits
- Merge branch 'haow/dev' into 'dev' · 077988b8
  王浩 authored Feb 21, 2019
```
tag add collection alias

See merge request !67
```
  077988b8
- add collection tag in tag and topic · b71ab3a3
  王浩 authored Feb 21, 2019
  
  b71ab3a3
- Merge branch 'master' of http://git.wanmeizhensuo.com/alpha/sun into haow/dev · 21ddba98
  王浩 authored Feb 21, 2019
  
  21ddba98
- Merge branch 'chenwei/feature/suggestion' into 'dev' · 48d41d3b
  陈伟 authored Feb 21, 2019
```
增加意见和建议

See merge request !66
```
  48d41d3b
- 增加导入 · f8ebbea5
  Davve authored Feb 21, 2019
  
  f8ebbea5
- 解决冲突 · df19dbdc
  Davve authored Feb 21, 2019
  
  df19dbdc
- 解决冲突 · 96b89357
  Davve authored Feb 21, 2019
  
  96b89357
- Merge branch 'master' into dev · 5bc51f02
  Davve authored Feb 21, 2019
  
  5bc51f02
18 Feb, 2019 1 commit
- Merge branch 'test' into 'master' · 3cf4253e
  王浩 authored Feb 18, 2019
```
Alpha 1.3 上线

See merge request !65
```
  3cf4253e
15 Feb, 2019 5 commits
- Merge branch 'feature/create_image_zy' into 'master' · e2dc1971
  zhanglu authored Feb 15, 2019
```
人脸图片保存

See merge request !64
```
  e2dc1971
- Merge branch 'feature/create_image_zy' into 'test' · 57ccac06
  zhanglu authored Feb 15, 2019
```
注释扫脸逻辑

See merge request !63
```
  57ccac06
- 增加意见和建议 · d77202ba
  Davve authored Feb 15, 2019
  
  d77202ba
- Merge branch 'feature/suggestion' into dev · fcc751c1
  Davve authored Feb 15, 2019
  
  fcc751c1
- 清除代码 · 50a10ef2
  Davve authored Feb 15, 2019
  
  50a10ef2
14 Feb, 2019 2 commits
- Merge branch 'feature/create_image_zy' into 'dev' · a428a228
  zhanglu authored Feb 14, 2019
```
注释扫脸逻辑

See merge request !62
```
  a428a228
- 注释扫脸逻辑 · b939fca8
  张永 authored Feb 14, 2019
  
  b939fca8