Commits · b8e9ab6b5fb202c4429bff4f72873534127dc38e · html / poolin_app

11 Feb, 2018 3 commits
- Merge branch 'zhanghui' into develop · b8e9ab6b
  zhanghui1 committed Feb 11, 2018
  
  b8e9ab6b Browse Files
- test · 5c645564
  zhanghui1 committed Feb 11, 2018
  
  5c645564 Browse Files
- Merge branch 'jingjie' of gitlab.maxrocky.com:html/poolin_app into zhanghui · a0a5d7a5
  zhanghui1 committed Feb 11, 2018
  
  a0a5d7a5 Browse Files
10 Feb, 2018 1 commit
- 未完成错误版 · 42f40dbb
  zhanghui1 committed Feb 10, 2018
  
  42f40dbb Browse Files
08 Feb, 2018 1 commit
- 甲方功能嵌套login和reg · 8e97b441
  zhanghui1 committed Feb 08, 2018
  
  8e97b441 Browse Files
07 Feb, 2018 5 commits
- 添加跨域支持 · cfc04940
  liangqi committed Feb 07, 2018
  
  cfc04940 Browse Files
- 添加跨域支持 · 9b2efc47
  liangqi committed Feb 07, 2018
  
  9b2efc47 Browse Files
- 更改大小写命名规范 · 7e7a6b15
  liangqi committed Feb 07, 2018
  
  7e7a6b15 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 42aceb71
  liangqi committed Feb 07, 2018
  
  42aceb71 Browse Files
- 更改大小写命名规范 · dfae3f9e
  liangqi committed Feb 07, 2018
  
  dfae3f9e Browse Files
06 Feb, 2018 7 commits
- Merge branch 'zhanghui' into 'develop' · eb1c4ccf
```
name：address



See merge request !26
```
  zhanghui committed Feb 06, 2018
  eb1c4ccf Browse Files
- name：address · c223ccb8
  zhanghui1 committed Feb 06, 2018
  
  c223ccb8 Browse Files
- 更改大小写命名规范 · 320c6f8c
  liangqi committed Feb 06, 2018
  
  320c6f8c Browse Files
- Merge branch 'zhanghui' into 'develop' · acef61a2
```
解决组件命名address会报错



See merge request !25
```
  zhanghui committed Feb 06, 2018
  acef61a2 Browse Files
- 解决组件命名address会报错 · 78aa23cb
  zhanghui1 committed Feb 06, 2018
  
  78aa23cb Browse Files
- Merge branch 'zhanghui' into 'develop' · 87af4284
```
完善地址、新账号无节点和算力的判断



See merge request !24
```
  zhanghui committed Feb 06, 2018
  87af4284 Browse Files
- 完善地址、新账号无节点和算力的判断 · f6890a49
  zhanghui1 committed Feb 06, 2018
  
  f6890a49 Browse Files
05 Feb, 2018 2 commits
- Merge branch 'zhanghui' into 'develop' · 447005e7
```
1111



See merge request !23
```
  zhanghui committed Feb 05, 2018
  447005e7 Browse Files
- 1111 · 0409e66d
  zhanghui1 committed Feb 05, 2018
  
  0409e66d Browse Files
04 Feb, 2018 2 commits
- Merge branch 'zhanghui' into 'develop' · 66c3a83a
```
完善矿机列表一期需求



See merge request !22
```
  zhanghui committed Feb 04, 2018
  66c3a83a Browse Files
- 完善矿机列表一期需求 · 3cfdebab
  zhanghui1 committed Feb 04, 2018
  
  3cfdebab Browse Files
02 Feb, 2018 4 commits
- Merge branch 'zhanghui' into 'develop' · 2d57f0de
```
矿机接口数据



See merge request !21
```
  zhanghui committed Feb 02, 2018
  2d57f0de Browse Files
- 矿机接口数据 · 697c181e
  zhanghui1 committed Feb 02, 2018
  
  697c181e Browse Files
- Merge branch 'zhanghui' into 'develop' · 24fec8d6
```
最新合并代码



See merge request !20
```
  zhanghui committed Feb 02, 2018
  24fec8d6 Browse Files
- 最新合并代码 · fac602f9
  zhanghui1 committed Feb 02, 2018
  
  fac602f9 Browse Files
31 Jan, 2018 2 commits
- Merge branch 'zhanghui' into 'develop' · e5d234eb
```
部分细节修改



See merge request !19
```
  zhanghui committed Jan 31, 2018
  e5d234eb Browse Files
- 部分细节修改 · 772f3082
  zhanghui1 committed Jan 31, 2018
  
  772f3082 Browse Files
30 Jan, 2018 7 commits
- Merge branch 'zhanghui' into 'develop' · 497fd6cf
```
语言选择



See merge request !18
```
  zhanghui committed Jan 30, 2018
  497fd6cf Browse Files
- 语言选择 · 2a11f561
  zhanghui1 committed Jan 30, 2018
  
  2a11f561 Browse Files
- close · df51965b
  zhanghui1 committed Jan 30, 2018
  
  df51965b Browse Files
- 大量修改 · d8e3227d
  zhanghui1 committed Jan 30, 2018
  
  d8e3227d Browse Files
- Merge branch 'gaolei' into 'develop' · 2ed978d7
```
Gaolei



See merge request !14
```
  zhanghui committed Jan 30, 2018
  2ed978d7 Browse Files
- 解决冲突 · 8ddb3f40
  gaolei committed Jan 30, 2018
  
  8ddb3f40 Browse Files
- 链接接口 · c0eb1e77
  gaolei committed Jan 30, 2018
  
  c0eb1e77 Browse Files
29 Jan, 2018 2 commits
- Merge branch 'zhanghui' into 'develop' · 78b54381
```
Zhanghui



See merge request !13
```
  zhanghui committed Jan 29, 2018
  78b54381 Browse Files
- 代码重构优化 · 62483aa9
  zhanghui1 committed Jan 29, 2018
  
  62483aa9 Browse Files
28 Jan, 2018 1 commit
- 还是搞不明白 · 30024249
  zhanghui1 committed Jan 28, 2018
  
  30024249 Browse Files
27 Jan, 2018 1 commit
- 没搞明白vuex模块 · c71f3f79
  zhanghui1 committed Jan 28, 2018
  
  c71f3f79 Browse Files
26 Jan, 2018 1 commit
- dashboard相关修改未完 · acc12d13
  zhanghui1 committed Jan 26, 2018
  
  acc12d13 Browse Files
25 Jan, 2018 1 commit
- 设置密码 · c52f4ab4
  gaolei committed Jan 25, 2018
  
  c52f4ab4 Browse Files