Commits · 8556f75300354980519216f33f2c4d41a1541353 · baiguangyao / mr-julyedu · GitLab

20 Dec, 2019 13 commits
- build · 8556f753
  FE committed Dec 20, 2019
  
  8556f753 Browse Files
- Merge branch '00-formal' into dev · ee5ac9e1
  FE committed Dec 20, 2019
  
  ee5ac9e1 Browse Files
- add notice · 7521d0ee
  FE committed Dec 20, 2019
  
  7521d0ee Browse Files
- build · 2ace24a7
  FE committed Dec 20, 2019
  
  2ace24a7 Browse Files
- Merge branch '00-formal' into dev · bab0b025
  FE committed Dec 20, 2019
  
  bab0b025 Browse Files
- course count down modify · 07774ad3
  FE committed Dec 20, 2019
  
  07774ad3 Browse Files
- build · 5fe5271a
  FE committed Dec 20, 2019
  
  5fe5271a Browse Files
- Merge branch '00' of gitlab.julyedu.com:baiguangyao/mr-julyedu into dev · d09610c1
  FE committed Dec 20, 2019
  
  d09610c1 Browse Files
- Merge branch '00-formal' into dev · 6acd0618
  FE committed Dec 20, 2019
  
  6acd0618 Browse Files
- style modify · 193c1e26
  FE committed Dec 20, 2019
  
  193c1e26 Browse Files
- merge 00-formal and build · 35766e83
  FE committed Dec 20, 2019
  
  35766e83 Browse Files
- del no used file · 5a05c1b6
  FE committed Dec 20, 2019
  
  5a05c1b6 Browse Files
- bargain bind phone modify · 90871162
  FE committed Dec 20, 2019
  
  90871162 Browse Files
19 Dec, 2019 9 commits
- key error · a0ea8a63
  FE committed Dec 19, 2019
  
  a0ea8a63 Browse Files
- bargain status modify · 1bb24abd
  FE committed Dec 19, 2019
  
  1bb24abd Browse Files
- formal activity basic complete · a73c3fea
  FE committed Dec 19, 2019
  
  a73c3fea Browse Files
- 链接特殊处理 · 88cef7b6
  zhanghaozhe committed Dec 19, 2019
  
  88cef7b6 Browse Files
- Merge branch '00' of gitlab.julyedu.com:baiguangyao/mr-julyedu into 00 · 3299c85a
  wangshuo committed Dec 19, 2019
  
  3299c85a Browse Files
- 已结束背景颜色 · e05c7b54
  wangshuo committed Dec 19, 2019
  
  e05c7b54 Browse Files
- Merge branch '00' of gitlab.julyedu.com:baiguangyao/mr-julyedu into 00 · 2eff8193
  zhanghaozhe committed Dec 19, 2019
  
  2eff8193 Browse Files
- 特殊处理分享链接 · 48aebae9
  zhanghaozhe committed Dec 19, 2019
  
  48aebae9 Browse Files
- 直播已结束状态添加 · 70c7430a
  wangshuo committed Dec 19, 2019
  
  70c7430a Browse Files
18 Dec, 2019 18 commits
- 备用方案 · 5c9a4f44
  zhanghaozhe committed Dec 18, 2019
  
  5c9a4f44 Browse Files
- 备用方案 · 1ce552b3
  zhanghaozhe committed Dec 18, 2019
  
  1ce552b3 Browse Files
- Merge branch '00' into dev · 823bd928
  zhanghaozhe committed Dec 18, 2019
  
  823bd928 Browse Files
- 备用方案 · a99629b5
  zhanghaozhe committed Dec 18, 2019
  
  a99629b5 Browse Files
- 备用方案 · 853245bc
  zhanghaozhe committed Dec 18, 2019
  
  853245bc Browse Files
- 备用方案 · b615398b
  zhanghaozhe committed Dec 18, 2019
  
  b615398b Browse Files
- Merge branch '00' into dev · 60a08e0e
  zhanghaozhe committed Dec 18, 2019
  
  60a08e0e Browse Files
- 备用方案 · 0d127fe8
  zhanghaozhe committed Dec 18, 2019
  
  0d127fe8 Browse Files
- ai course · 44da469c
  FE committed Dec 18, 2019
  
  44da469c Browse Files
- 备用方案 · 1141d8ad
  zhanghaozhe committed Dec 18, 2019
  
  1141d8ad Browse Files
- 活动结束 · 60cca55d
  zhanghaozhe committed Dec 18, 2019
  
  60cca55d Browse Files
- Merge branch 'syangby' into dev · 68c4725c
  zhanghaozhe committed Dec 18, 2019
  
  68c4725c Browse Files
- 活动结束 · bed0b0bf
  zhanghaozhe committed Dec 18, 2019
  
  bed0b0bf Browse Files
- 活动结束 · 5d054ef8
  zhanghaozhe committed Dec 18, 2019
  
  5d054ef8 Browse Files
- Merge branch 'syangby' into dev · 545f92e0
  zhanghaozhe committed Dec 18, 2019
  
  545f92e0 Browse Files
- 活动结束 · d3ada8c5
  zhanghaozhe committed Dec 18, 2019
  
  d3ada8c5 Browse Files
- 活动结束状态 · 200e0af5
  zhanghaozhe committed Dec 18, 2019
  
  200e0af5 Browse Files
- Merge branch 'syangby' into dev · 13072c26
```
# Conflicts:
#	build/mrstatic/js/newyear-yearIndex.fee41c6c.chunk.js
#	build/mrstatic/js/runtime~main.bf845680.js
#	build/mrstatic/js/runtime~main.bf845680.js.map
```
  zhanghaozhe committed Dec 18, 2019
  13072c26 Browse Files