Commits · 557c810ec5e01d2a9c39792bd8466272119548a5 · xiaomai-cloud-class / xiaomai-cloud-class-web · GitLab

02 Feb, 2021 2 commits
- Merge branch 'hotfix/pangguoming/20210802/fix_live_search_time' into dev · 557c810e
  guomingpang committed Feb 02, 2021
  
  557c810e Browse Files
- Merge branch 'dev' of… · b52d2874
```
Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev
```
  guomingpang committed Feb 02, 2021
  b52d2874 Browse Files
02 Aug, 2021 2 commits
- feat:解决合并代码后的冲突 · 5a0b1d53
  zhangleyuan committed Aug 02, 2021
  
  5a0b1d53 Browse Files
- feat:处理视频的预览显示 · ffb147bc
  zhangleyuan committed Aug 02, 2021
  
  ffb147bc Browse Files
01 Aug, 2021 16 commits
- Merge branch 'feature/zhujian/0927/syoo' into dev · 091a4f1a
  zhujian committed Aug 01, 2021
  
  091a4f1a Browse Files
- fix · 792ccaf9
  zhujian committed Aug 01, 2021
  
  792ccaf9 Browse Files
- fix:hebingfenzhi · 91da19f9
  zhujian committed Aug 01, 2021
  
  91da19f9 Browse Files
- fix:合并分支冲突 · d721e082
  zhujian committed Aug 01, 2021
  
  d721e082 Browse Files
- 'fix:合并分支冲突' · 19486d4a
  zhujian committed Aug 01, 2021
  
  19486d4a Browse Files
- 'fix:合并分支冲突' · a5bb1615
  zhujian committed Aug 01, 2021
  
  a5bb1615 Browse Files
- 'fix:合并分支冲突' · c83aba27
  zhujian committed Aug 01, 2021
  
  c83aba27 Browse Files
- 'fix:合并分支冲突' · 0097eb49
  zhujian committed Aug 01, 2021
  
  0097eb49 Browse Files
- Merge branch 'feature/zhujian/0927/syoo' into dev · 8a475744
  zhujian committed Aug 01, 2021
  
  8a475744 Browse Files
- fix · 60f2495b
  zhujian committed Aug 01, 2021
  
  60f2495b Browse Files
- Merge branch 'feature/zhujian/0927/syoo' into dev · 35a49a18
  zhujian committed Aug 01, 2021
  
  35a49a18 Browse Files
- 'fix:合并分支冲突' · 0a2dd726
  zhujian committed Aug 01, 2021
  
  0a2dd726 Browse Files
- 'fix:合并分支冲突' · 99d7b9e4
  zhujian committed Aug 01, 2021
  
  99d7b9e4 Browse Files
- fix · 18e64979
  zhujian committed Aug 01, 2021
  
  18e64979 Browse Files
- 品牌替换 · 60bcf37b
  zhujian committed Aug 01, 2021
  
  60bcf37b Browse Files
- 品牌替换 · b5ee4a25
  zhujian committed Aug 01, 2021
  
  b5ee4a25 Browse Files
29 Jul, 2021 13 commits
- Merge branch 'feature/pangguoming/202010722/modify_banner_size' into 'master' · 31aba4ba
```
Feature/pangguoming/202010722/modify banner size

See merge request !79
```
  wufan committed Jul 29, 2021
  31aba4ba Browse Files
- Merge branch 'master' into feature/pangguoming/202010722/modify_banner_size · 592fce0c
  guomingpang committed Jul 29, 2021
  
  592fce0c Browse Files
- Merge branch 'master' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web · b716a476
  guomingpang committed Jul 29, 2021
  
  b716a476 Browse Files
- Merge branch 'feature/wufan/20210722/refactor-weekly' into 'master' · 0ee60e44
```
Feature/wufan/20210722/refactor weekly

See merge request !78
```
  wufan committed Jul 29, 2021
  0ee60e44 Browse Files
- Merge branch 'master' into feature/wufan/20210722/refactor-weekly · eafaa5e1
  wufan committed Jul 29, 2021
  
  eafaa5e1 Browse Files
- Merge branch 'feature/maolipeng/youhua' into 'master' · 1b15c34b
```
Feature/maolipeng/youhua

See merge request !76
```
  wufan committed Jul 29, 2021
  1b15c34b Browse Files
- Merge branch 'master' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web · e5d721a9
  guomingpang committed Jul 29, 2021
  
  e5d721a9 Browse Files
- Merge branch 'refactor/yuananting/20210722/aidtool-UI' into 'master' · 281c42ca
```
Refactor/yuananting/20210722/aidtool ui

See merge request !77
```
  wufan committed Jul 29, 2021
  281c42ca Browse Files
- docs:删除多余的注释代码 · ef697f0c
  yuananting committed Jul 29, 2021
  
  ef697f0c Browse Files
- Merge branch 'master' into refactor/yuananting/20210722/aidtool-UI · 17a4f0b9
  yuananting committed Jul 29, 2021
  
  17a4f0b9 Browse Files
- fix · da3e88e3
  zhujian committed Jul 29, 2021
  
  da3e88e3 Browse Files
- docs:删除无用的注释 · 95bec18d
  guomingpang committed Jul 29, 2021
  
  95bec18d Browse Files
- docs:删除无用的注释 · c6b1c283
  guomingpang committed Jul 29, 2021
  
  c6b1c283 Browse Files
28 Jul, 2021 7 commits
- Merge branch 'feature/pangguoming/202010722/modify_banner_size' into dev · 1eb551e7
  guomingpang committed Jul 28, 2021
  
  1eb551e7 Browse Files
- style: l l l ll l l lcategorySonName · a0a455ba
  guomingpang committed Jul 28, 2021
  
  a0a455ba Browse Files
- Merge branch 'feature/pangguoming/202010722/modify_banner_size' into dev · 76cf0d17
  guomingpang committed Jul 28, 2021
  
  76cf0d17 Browse Files
- style:线下课活动搜索名称过长问题修复 · c0226200
  guomingpang committed Jul 28, 2021
  
  c0226200 Browse Files
- fix:解决merge冲突 · f2bdc566
  guomingpang committed Jul 28, 2021
  
  f2bdc566 Browse Files
- Merge branch 'dev' of… · 2541b6b8
```
Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev
```
  guomingpang committed Jul 28, 2021
  2541b6b8 Browse Files
- docs:线下课重命名线下活动，资源云盘变更为素材库 · e0eafc54
  guomingpang committed Jul 28, 2021
  
  e0eafc54 Browse Files