Commits · 57c9a00a55d68f44c6d11397f6eb505dbf3a7469 · new-sing / admin-base

15 Dec, 2018 2 commits
- 修改样式 · 57c9a00a
  chenfenglei authored Dec 14, 2018
  
  57c9a00a
- 修改布局及问题 · a20e86b5
  chenfenglei authored Dec 14, 2018
  
  a20e86b5
14 Dec, 2018 2 commits
- 打包 · 59335d2d
  wangwei authored Dec 14, 2018
  
  59335d2d
- Merge branch 'my' into development · e1cb3551
  wangwei authored Dec 14, 2018
```
# Conflicts:
#	dev/index.html
#	dist/index.html
```
  e1cb3551
13 Dec, 2018 5 commits
- 富文本 · ba3d8142
  chenfenglei authored Dec 13, 2018
  
  ba3d8142
- 富文本 · 1a56eafa
  chenfenglei authored Dec 13, 2018
  
  1a56eafa
- 富文本 · c75bfa8c
  chenfenglei authored Dec 13, 2018
  
  c75bfa8c
- Merge branch 'development' of http://git.singsingenglish.com/new-sing/admin into development · 0beab470
  chenfenglei authored Dec 13, 2018
  
  0beab470
- 富文本 · 2c6b284d
  chenfenglei authored Dec 13, 2018
  
  2c6b284d
12 Dec, 2018 2 commits
- 打包 · fdf374f8
  wangwei authored Dec 12, 2018
  
  fdf374f8
- Merge branch 'development' into my · 95eabaf8
  wangwei authored Dec 12, 2018
```
# Conflicts:
#	dev/index.html
```
  95eabaf8
11 Dec, 2018 2 commits
- 打包 · 93614df5
  wangwei authored Dec 11, 2018
  
  93614df5
- 微信群发消息添加type=4, 指定用户手机号发送 · e8064663
  chenfenglei authored Dec 11, 2018
  
  e8064663
10 Dec, 2018 6 commits
- 公众号页面样式优化 · e754a0bf
  chenfenglei authored Dec 10, 2018
  
  e754a0bf
- 根据角色筛选帐户 · 1e863357
  chenfenglei authored Dec 10, 2018
  
  1e863357
- 根据角色筛选帐户 · db69b5ac
  chenfenglei authored Dec 10, 2018
  
  db69b5ac
- 商品列表显示商品编号，解决分页失效 · ee08f55c
  chenfenglei authored Dec 10, 2018
  
  ee08f55c
- Merge branch 'development' of http://git.singsingenglish.com/new-sing/admin into development · 287fa8e9
  chenfenglei authored Dec 10, 2018
  
  287fa8e9
- 班级列表排序 · 4ba24a18
  chenfenglei authored Dec 10, 2018
  
  4ba24a18
07 Dec, 2018 12 commits
- 打包 · 2c356b8e
  wangwei authored Dec 07, 2018
  
  2c356b8e
- 添加备注修改 · 9589855c
  chenfenglei authored Dec 07, 2018
  
  9589855c
- Merge branch 'development' of http://git.singsingenglish.com/new-sing/admin into development · cd5e09fb
  chenfenglei authored Dec 07, 2018
  
  cd5e09fb
- 添加班级页面备注列 · 43657a0e
  chenfenglei authored Dec 07, 2018
  
  43657a0e
- 打包 · 063f481d
  wangwei authored Dec 07, 2018
  
  063f481d
- Merge branch 'development' of http://git.singsingenglish.com/new-sing/admin into development · aedb1d17
  chenfenglei authored Dec 07, 2018
  
  aedb1d17
- a · 87a0a382
  chenfenglei authored Dec 07, 2018
  
  87a0a382
- Revert: Merge branch 'master' into my · 83a966f9
  wangwei authored Dec 07, 2018
  
  83a966f9
- 编辑器大小限制去除 · 60402fb4
  wangwei authored Dec 07, 2018
  
  60402fb4
- a · 605e40c2
  findy authored Dec 07, 2018
  
  605e40c2
- a · 5a46cdb5
  findy authored Dec 07, 2018
  
  5a46cdb5
- a · f50aa9a3
  findy authored Dec 07, 2018
  
  f50aa9a3
06 Dec, 2018 3 commits
- 编辑器大小限制去除 · cc562d7e
  wangwei authored Dec 06, 2018
  
  cc562d7e
- Merge branch 'master' into my · 48836ea1
  wangwei authored Dec 06, 2018
  
  48836ea1
- 编辑器大小限制去除 · 8b50ad52
  wangwei authored Dec 06, 2018
  
  8b50ad52
04 Dec, 2018 2 commits
- 添加权限 · 5edb6392
  wangwei authored Dec 04, 2018
  
  5edb6392
- 课包编辑回滚教师绑定用户位置修改 · 9434bc92
  wangwei authored Dec 04, 2018
  
  9434bc92
30 Nov, 2018 4 commits
- build · 9a4c5c92
  王 authored Nov 30, 2018
  
  9a4c5c92
- Merge branch 'development' of http://git.singsingenglish.com/new-sing/admin into development · e5b07fd1
  王 authored Nov 30, 2018
  
  e5b07fd1
- 班级列表老师加用户数，用户老师数 · b8486857
  王 authored Nov 30, 2018
  
  b8486857
- 课包编辑音频修改 · 6ffc5dc7
  wangwei authored Nov 30, 2018
  
  6ffc5dc7