Commits · 2a842293bc27b4f1ce65fef4b2fbdaf5c0a29aac · xiaomai-cloud-class / xiaomai-cloud-class-web · GitLab

05 Jul, 2021 1 commit
- 'fix' · 2a842293
  zhujian committed Jul 05, 2021
  
  2a842293 Browse Files
04 Jul, 2021 11 commits
- Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into rc · e04470d1
```
# Conflicts:
#	src/modules/home/Home.jsx
```
  maolipeng committed Jul 04, 2021
  e04470d1 Browse Files
- fix:sdasdadadasd · 7efa89ff
  maolipeng committed Jul 04, 2021
  
  7efa89ff Browse Files
- Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into rc · 09274132
```
# Conflicts:
#	src/data-source/base/request-apis.ts
#	src/domains/basic-domain/baseService.ts
#	src/modules/course-manage/components/LiveCourseList.jsx
#	src/modules/course-manage/graphics-course/components/GraphicsCourseList.jsx
#	src/modules/root/Menu.tsx
```
  maolipeng committed Jul 04, 2021
  09274132 Browse Files
- Merge branch 'feature/pangguoming/20210701/active_students_number' into rc · 89a8dc02
  guomingpang committed Jul 04, 2021
  
  89a8dc02 Browse Files
- style:禁止换行 · b033bb3b
  guomingpang committed Jul 04, 2021
  
  b033bb3b Browse Files
- Merge branch 'feature/pangguoming/20210701/active_students_number' into rc · d1872178
  guomingpang committed Jul 04, 2021
  
  d1872178 Browse Files
- fix:课程总数本月新增 · 85ce4d41
  guomingpang committed Jul 04, 2021
  
  85ce4d41 Browse Files
- Merge branch 'feature/pangguoming/20210701/active_students_number' into rc · ee2b5895
  guomingpang committed Jul 04, 2021
  
  ee2b5895 Browse Files
- Merge branch 'rc' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into rc · 9e63d0d2
  guomingpang committed Jul 04, 2021
  
  9e63d0d2 Browse Files
- style:周活跃样式修改 · fc362d7d
  guomingpang committed Jul 04, 2021
  
  fc362d7d Browse Files
- Merge branch 'master' into feature/maolipeng/20210610/zuhuyouhua · 0eedc63e
```
# Conflicts:
#	src/data-source/base/request-apis.ts
#	src/domains/basic-domain/baseService.ts
#	src/modules/course-manage/components/LiveCourseList.jsx
#	src/modules/course-manage/graphics-course/components/GraphicsCourseList.jsx
#	src/modules/root/Login.jsx
#	src/modules/root/Menu.less
#	src/modules/root/Menu.tsx
#	src/modules/teach-tool/paper-manage/OperatePaper.jsx
#	src/modules/teach-tool/paper-manage/OperatePaper.less
```
  maolipeng committed Jul 04, 2021
  0eedc63e Browse Files
02 Jul, 2021 21 commits
- Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into rc · 611f7bad
```
# Conflicts:
#	src/modules/root/Menu.less
#	src/modules/root/Menu.tsx
```
  maolipeng committed Jul 02, 2021
  611f7bad Browse Files
- Merge branch 'rc' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into rc · 9a6fb98d
  guomingpang committed Jul 02, 2021
  
  9a6fb98d Browse Files
- fix:........ · 466cbc53
  maolipeng committed Jul 02, 2021
  
  466cbc53 Browse Files
- Merge branch 'feature/pangguoming/20210701/active_students_number' into rc · 464d886d
  guomingpang committed Jul 02, 2021
  
  464d886d Browse Files
- fix:修复中心首页初始化课程总数闪现NaN的问题 · a2627059
  guomingpang committed Jul 02, 2021
  
  a2627059 Browse Files
- Merge branch 'feature/maolipeng/20210629/piliang' into rc · 201b3441
  maolipeng committed Jul 02, 2021
  
  201b3441 Browse Files
- fix:去除小数，，， · ed9cbf2f
  maolipeng committed Jul 02, 2021
  
  ed9cbf2f Browse Files
- fix:去除小数，，， · e65e34ab
  maolipeng committed Jul 02, 2021
  
  e65e34ab Browse Files
- merge:首页周活跃人数统计merge to rc · 2b80ae46
  guomingpang committed Jul 02, 2021
  
  2b80ae46 Browse Files
- merge:首页周活跃人数统计merge to rc · e7f2a8f9
  guomingpang committed Jul 02, 2021
  
  e7f2a8f9 Browse Files
- merge:首页周活跃人数统计merge to rc · 0e4bb264
  guomingpang committed Jul 02, 2021
  
  0e4bb264 Browse Files
- merge:merge master · f530ebcf
  guomingpang committed Jul 02, 2021
  
  f530ebcf Browse Files
- Merge branch 'rc' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into rc · ce7a5a1e
  guomingpang committed Jul 02, 2021
  
  ce7a5a1e Browse Files
- Merge branch 'feature/maolipeng/20210629/piliang' into rc · 1cf7cde7
  maolipeng committed Jul 02, 2021
  
  1cf7cde7 Browse Files
- fix:得分不少于漏选分 · 404016dd
  maolipeng committed Jul 02, 2021
  
  404016dd Browse Files
- Merge branch 'master' into feature/pangguoming/20210701/active_students_number · bfaec9cc
  guomingpang committed Jul 02, 2021
  
  bfaec9cc Browse Files
- Merge branch 'master' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web · 64f4b1f6
  guomingpang committed Jul 02, 2021
  
  64f4b1f6 Browse Files
- Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into rc · 4d000446
```
# Conflicts:
#	src/modules/teach-tool/paper-manage/OperatePaper.jsx
#	src/modules/teach-tool/paper-manage/OperatePaper.less
```
  maolipeng committed Jul 02, 2021
  4d000446 Browse Files
- fix:样式修改。。。。。 · cf5ce3a5
  maolipeng committed Jul 02, 2021
  
  cf5ce3a5 Browse Files
- Merge branch 'feature/maolipeng/20210629/piliang' into rc · 7c6aec21
  maolipeng committed Jul 02, 2021
  
  7c6aec21 Browse Files
- fix:批量设置得分不低于半对得分 · 22be4c24
  maolipeng committed Jul 02, 2021
  
  22be4c24 Browse Files
01 Jul, 2021 7 commits
- Merge branch 'feature/maolipeng/20210629/piliang' into rc · 2eb30830
```
# Conflicts:
#	src/modules/teach-tool/paper-manage/OperatePaper.jsx
```
  maolipeng committed Jul 01, 2021
  2eb30830 Browse Files
- Merge branch 'refactor/yuanating/20210625/collage-init' into 'master' · 7638b279
```
Refactor/yuanating/20210625/collage init

See merge request !58
```
  wufan committed Jul 01, 2021
  7638b279 Browse Files
- Merge branch 'master' into refactor/yuanating/20210625/collage-init · 15ec8efb
  yuananting committed Jul 01, 2021
  
  15ec8efb Browse Files
- Merge branch 'hotfix/pangguoming/20210629/modify_course_manage_default_img' into 'master' · 973e9412
```
Hotfix/pangguoming/20210629/modify course manage default img

See merge request !57
```
  wufan committed Jul 01, 2021
  973e9412 Browse Files
- fix:修改直播课分享海报封面取值 · 4e806805
  yuananting committed Jul 01, 2021
  
  4e806805 Browse Files
- fix:////// · f946fc86
  maolipeng committed Jul 01, 2021
  
  f946fc86 Browse Files
- merge:合并master · 8968c2d0
  guomingpang committed Jul 01, 2021
  
  8968c2d0 Browse Files