Commits · 70a3acc250bba8cf795f1c1ba17057878219298c · xiaomai-cloud-class / xiaomai-cloud-class-web · GitLab

09 Jul, 2021 14 commits
- Merge branch 'feature/wufan/20210701/course-B-reform' into dev · 70a3acc2
  zhujian committed Jul 09, 2021
  
  70a3acc2 Browse Files
- 'fix' · db004aa7
  zhujian committed Jul 09, 2021
  
  db004aa7 Browse Files
- 'fix' · 3227be7a
  zhujian committed Jul 09, 2021
  
  3227be7a Browse Files
- fix:视频详情页课节序号调整 · 5276872c
  yuananting committed Jul 09, 2021
  
  5276872c Browse Files
- feat:去掉无用代码 · 535010ce
  wufan committed Jul 09, 2021
  
  535010ce Browse Files
- Merge branch 'feature/wufan/20210701/course-B-reform' into dev · 5e2c283c
  wufan committed Jul 09, 2021
  
  5e2c283c Browse Files
- feat：添加课节数20个限制 · cb312b50
  wufan committed Jul 09, 2021
  
  cb312b50 Browse Files
- fix:解决合并细节优化的冲突 · 8f1de292
  yuananting committed Jul 09, 2021
  
  8f1de292 Browse Files
- fix:序号调整+课节数字段补充 · e9f49fc6
  yuananting committed Jul 09, 2021
  
  e9f49fc6 Browse Files
- fix:添加因合并分支丢失的视频上传相关方法的代码 · 59fa070f
  yuananting committed Jul 09, 2021
  
  59fa070f Browse Files
- Merge branch 'feature/wufan/20210701/course-B-reform' into dev · 3ef91dc7
  wufan committed Jul 09, 2021
  
  3ef91dc7 Browse Files
- feat:优化外部课展示栏 · cb42c593
  wufan committed Jul 09, 2021
  
  cb42c593 Browse Files
- feat:解决合并代码后的冲突 · 10160b25
  zhangleyuan committed Jul 09, 2021
  
  10160b25 Browse Files
- feat:处理前往学院的码 · 9b034827
  zhangleyuan committed Jul 09, 2021
  
  9b034827 Browse Files
08 Jul, 2021 26 commits
- fix:解决合并周优化的分支冲突 · 27a89940
  yuananting committed Jul 08, 2021
  
  27a89940 Browse Files
- Merge branch 'feature/wufan/20210701/course-B-reform' into dev · 1f5b217c
  wufan committed Jul 08, 2021
  
  1f5b217c Browse Files
- Merge branch 'refactor/wufan/20210702/teach-tool-empty-picture' into 'master' · 806f97d6
```
Refactor/wufan/20210702/teach tool empty picture

See merge request !66
```
  wufan committed Jul 08, 2021
  806f97d6 Browse Files
- Merge branch 'master' into refactor/wufan/20210702/teach-tool-empty-picture · a34a356e
  wufan committed Jul 08, 2021
  
  a34a356e Browse Files
- Merge branch 'feature/maolipeng/youhua' into 'master' · 63a84197
```
Feature/maolipeng/youhua

See merge request !65
```
  maolipeng committed Jul 08, 2021
  63a84197 Browse Files
- feat:新建线上课样式优化 · 2e80dc54
  wufan committed Jul 08, 2021
  
  2e80dc54 Browse Files
- Merge branch 'master' into feature/maolipeng/youhua · d64fb254
  maolipeng committed Jul 08, 2021
  
  d64fb254 Browse Files
- Merge branch 'feature/zhangleyuan/20210629/image-crop' into 'master' · c18a3e02
```
Feature/zhangleyuan/20210629/image crop

See merge request !64
```
  wufan committed Jul 08, 2021
  c18a3e02 Browse Files
- Merge branch 'feature/wufan/20210701/course-B-reform' into dev · 532cc394
  yuananting committed Jul 08, 2021
  
  532cc394 Browse Files
- fix:培训计划关联课程视频课封面修改 · 1e631a44
  yuananting committed Jul 08, 2021
  
  1e631a44 Browse Files
- feat:删除注释 · b41087ac
  zhangleyuan committed Jul 08, 2021
  
  b41087ac Browse Files
- feat:删除注释代码 · 5d293f90
  zhangleyuan committed Jul 08, 2021
  
  5d293f90 Browse Files
- feat:解决合并代码后的冲突 · d719be39
  zhangleyuan committed Jul 08, 2021
  
  d719be39 Browse Files
- Merge branch 'feature/yuananting/20210705/select-course-limit' into 'master' · 377cc37b
```
Feature/yuananting/20210705/select course limit

See merge request !63
```
  wufan committed Jul 08, 2021
  377cc37b Browse Files
- Merge branch 'master' into feature/yuananting/20210705/select-course-limit · 961679f4
  yuananting committed Jul 08, 2021
  
  961679f4 Browse Files
- Merge branch 'feature/pangguoming/202010704/style_update' into 'master' · 62b372e7
```
Feature/pangguoming/202010704/style update

See merge request !62
```
  wufan committed Jul 08, 2021
  62b372e7 Browse Files
- Merge branch 'master' into feature/pangguoming/202010704/style_update · 3ef39fa3
  guomingpang committed Jul 08, 2021
  
  3ef39fa3 Browse Files
- Merge branch 'master' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web · eda60cb7
  guomingpang committed Jul 08, 2021
  
  eda60cb7 Browse Files
- Merge branch 'feature/wufan/20210701/course-B-reform' into dev · caf64e76
  yuananting committed Jul 08, 2021
  
  caf64e76 Browse Files
- fix:修复重命名视频名称无法输入中文的问题 · 0ac5dd4d
  yuananting committed Jul 08, 2021
  
  0ac5dd4d Browse Files
- style:培训计划表格样式优化 · d369e7bf
  guomingpang committed Jul 08, 2021
  
  d369e7bf Browse Files
- style:培训计划表格样式优化 · b3e629a1
  guomingpang committed Jul 08, 2021
  
  b3e629a1 Browse Files
- feat:处理重新上传 · c6f1064c
  zhangleyuan committed Jul 08, 2021
  
  c6f1064c Browse Files
- style:培训计划表格样式优化 · 2738cc37
  guomingpang committed Jul 08, 2021
  
  2738cc37 Browse Files
- style:培训计划表格样式优化 · 0b40c523
  guomingpang committed Jul 08, 2021
  
  0b40c523 Browse Files
- Merge branch 'feature/wufan/20210701/course-B-reform' into dev · b3622270
  yuananting committed Jul 08, 2021
  
  b3622270 Browse Files