Commit Graph
9 Commits
Author SHA1 Message Date
zhangmin 12832511c9 Merge branch 'feature/uploader' into 'master'
Feature/uploader



See merge request !11
2017-03-15 10:51:41 +08:00
zhangmin 7d27e94ded Merge branch 'feature/progress' into 'master'
Feature/progress



See merge request !10
2017-03-13 21:20:18 +08:00
zhangmin 9bb76ae8cd Merge branch 'feature/tabs_lazyload' into 'master'
Feature/tabs lazyload

review一下

See merge request !9
2017-03-08 15:24:36 +08:00
zhangmin 0e8b918f3e Merge branch 'hotfix/switch_loading_fix' into 'master'
Hotfix/switch loading fix

loading switch 更新

See merge request !8
2017-03-02 20:01:26 +08:00
zhangmin bd24b22203 Merge branch 'hotfix/switch_loading_fix' into 'master'
Hotfix/switch loading fix



See merge request !6
2017-03-01 17:06:43 +08:00
zhangmin f5564a0d61 Merge branch 'dev/badge_search' into 'master'
Dev/badge search

张大哥合一下我的组件

See merge request !7
2017-03-01 17:01:29 +08:00
zhangmin 533133a537 Merge branch 'hotfix/waterfall' into 'master'
Hotfix/waterfall



See merge request !4
2017-02-27 10:42:51 +08:00
zhangmin 3ba60907b7 Merge branch 'loading' into 'master'
Loading

添加loading组件

See merge request !2
2017-02-23 11:09:38 +08:00
zhangmin 4589081506 Merge branch 'add_switch_animation' into 'master'
Add switch animation



See merge request !1
2017-02-22 15:34:34 +08:00