Commits · a0f441ed8293d3b136a0f7bdae5af384f72e1bfb · xiaomai-cloud-class / xiaomai-cloud-class-web · GitLab

15 Jun, 2021 6 commits
- fix:拖拽节点放置节点父级信息修改 · a0f441ed
  yuananting committed Jun 15, 2021
  
  a0f441ed Browse Files
- fix:合并闭合括号缺失 · 4b655fc2
  yuananting committed Jun 15, 2021
  
  4b655fc2 Browse Files
- fix:解决合并分类拖拽接口修改及分类数为0隐藏的冲突 · b61f0978
  yuananting committed Jun 15, 2021
  
  b61f0978 Browse Files
- feat:分类拖拽优化，分类为0隐藏 · 495240cf
  yuananting committed Jun 15, 2021
  
  495240cf Browse Files
- Merge branch 'feature/zhangleyuan/20210610/img-show' into dev · 9c90120f
  zhangleyuan committed Jun 15, 2021
  
  9c90120f Browse Files
- feat:调增分享弹框的样式 · 9fd6948b
  zhangleyuan committed Jun 15, 2021
  
  9fd6948b Browse Files
11 Jun, 2021 5 commits
- feat:解决合并代码后的冲突 · 33d337ee
  zhangleyuan committed Jun 11, 2021
  
  33d337ee Browse Files
- feat:修改分享图片模糊的问题 · dab77437
  zhangleyuan committed Jun 11, 2021
  
  dab77437 Browse Files
- Merge branch 'feature/zahngleyuan/20210607/cloud-cass-remodel' into dev · a9b0e9e2
  zhangleyuan committed Jun 11, 2021
  
  a9b0e9e2 Browse Files
- feat:处理永中的标题显示 · da36abd7
  zhangleyuan committed Jun 11, 2021
  
  da36abd7 Browse Files
- feat:设置永中预览页面标题 · df301fc6
  zhangleyuan committed Jun 11, 2021
  
  df301fc6 Browse Files
10 Jun, 2021 29 commits
- Merge branch 'feature/yuananting/20210602/replace-defaul-cover' into 'master' · f93b6906
```
fix:删除考试模块答案详情前缀特殊字符

See merge request !40
```
  zhangleyuan committed Jun 10, 2021
  f93b6906 Browse Files
- fix:删除考试模块答案详情前缀特殊字符 · 1cc3e9cd
  yuananting committed Jun 10, 2021
  
  1cc3e9cd Browse Files
- Merge branch 'feature/zhangleyuan/20210608/optimize' into 'master' · dfaacbb6
```
Feature/zhangleyuan/20210608/optimize

See merge request !39
```
  wufan committed Jun 10, 2021
  dfaacbb6 Browse Files
- Merge branch 'master' into feature/zhangleyuan/20210608/optimize · e6b0a291
  zhangleyuan committed Jun 10, 2021
  
  e6b0a291 Browse Files
- Merge branch 'feature/pangguoming/20210607/answer_detail' into 'master' · a1e475c8
```
merge: 修改冲突

See merge request !38
```
  wufan committed Jun 10, 2021
  a1e475c8 Browse Files
- merge: 修改冲突 · 37ede287
  guomingpang committed Jun 10, 2021
  
  37ede287 Browse Files
- Merge branch 'feature/zhangleyuan/20210610/cloud-level' into feature/zhangleyuan/20210608/optimize · 4d6d1112
  zhangleyuan committed Jun 10, 2021
  
  4d6d1112 Browse Files
- Merge branch 'feature/pangguoming/20210607/answer_detail' into 'master' · 7e92433c
```
Feature/pangguoming/20210607/answer detail

See merge request !37
```
  wufan committed Jun 10, 2021
  7e92433c Browse Files
- merge: merge master代码 · 1f11f4b3
  guomingpang committed Jun 10, 2021
  
  1f11f4b3 Browse Files
- feat:优化图片显示 · c332cb19
  zhangleyuan committed Jun 10, 2021
  
  c332cb19 Browse Files
- Merge branch 'master' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web · 6fb0e402
  guomingpang committed Jun 10, 2021
  
  6fb0e402 Browse Files
- Merge branch 'feature/yuananting/20210602/replace-defaul-cover' into 'master' · 679a3038
```
Feature/yuananting/20210602/replace defaul cover

See merge request !36
```
  wufan committed Jun 10, 2021
  679a3038 Browse Files
- fix:解决快捷排序合并冲突 · eecff8bd
  yuananting committed Jun 10, 2021
  
  eecff8bd Browse Files
- Merge branch 'master' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web · 9009ac6d
  guomingpang committed Jun 10, 2021
  
  9009ac6d Browse Files
- Merge branch 'feature/chenshu/educationalTools' into 'master' · 315dfe46
```
Feature/chenshu/educational tools

See merge request !35
```
  wufan committed Jun 10, 2021
  315dfe46 Browse Files
- Merge branch 'master' into feature/chenshu/educationalTools · ad3aa197
  chenshu committed Jun 10, 2021
  
  ad3aa197 Browse Files
- fix:修改样式 · d3019351
  chenshu committed Jun 10, 2021
  
  d3019351 Browse Files
- Merge branch 'feature/pangguoming/20210607/answer_detail' into dev · 3f881d0e
  guomingpang committed Jun 10, 2021
  
  3f881d0e Browse Files
- Merge branch 'dev' of… · d24b1af0
```
Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev
```
  guomingpang committed Jun 10, 2021
  d24b1af0 Browse Files
- feat:package文件新增rc ,gray等启动环境 · 7f7c5b3d
  guomingpang committed Jun 10, 2021
  
  7f7c5b3d Browse Files
- feat:修改图片模糊的问题 · 00d38a54
  zhangleyuan committed Jun 10, 2021
  
  00d38a54 Browse Files
- feat:修改资料云盘的层级限制 · 61da1798
  zhangleyuan committed Jun 10, 2021
  
  61da1798 Browse Files
- feat:修改资料云盘层级限制 · 8babb222
  zhangleyuan committed Jun 10, 2021
  
  8babb222 Browse Files
- Merge branch 'feature/pangguoming/20210607/answer_detail' into dev · 62beaf0e
  guomingpang committed Jun 10, 2021
  
  62beaf0e Browse Files
- style:答题详情样式调整 · e7db60cb
  guomingpang committed Jun 10, 2021
  
  e7db60cb Browse Files
- Merge branch 'feature/pangguoming/20210607/answer_detail' into dev · 90ced0c7
  guomingpang committed Jun 10, 2021
  
  90ced0c7 Browse Files
- Merge branch 'dev' of… · e80656d5
```
Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev
```
  guomingpang committed Jun 10, 2021
  e80656d5 Browse Files
- style:答题详情样式调整 · e6a81194
  guomingpang committed Jun 10, 2021
  
  e6a81194 Browse Files
- Merge branch 'feature/yuananting/20210602/replace-defaul-cover' into dev · 16f3fe75
  yuananting committed Jun 10, 2021
  
  16f3fe75 Browse Files