Commits · a067b1445ff2e4fd08e21fe5d1f6fd51343d8129 · Laoqifeng / zeroing-editor

03 May, 2020 1 commit
- 完成资源分组加载功能 · a067b144
  rockyl authored May 03, 2020
  
  a067b144
30 Apr, 2020 1 commit
- 保存一波 · ef9e00da
  rockyl authored Apr 30, 2020
  
  ef9e00da
29 Apr, 2020 3 commits
- 保存一波 · 5df2db02
  rockyl authored Apr 29, 2020
  
  5df2db02
- Merge branch 'dev' into res-group · 4a590bd4
  rockyl authored Apr 29, 2020
  
  4a590bd4
- 打开项目直接使用本地 · e55c563d
  rockyl authored Apr 29, 2020
  
  e55c563d
28 Apr, 2020 3 commits
- Merge branch 'dev' into res-group · 5e7b8896
  rockyl authored Apr 28, 2020
  
  5e7b8896
- 冲突解决改为json拆分后解决冲突 · 2858b006
  rockyl authored Apr 28, 2020
  
  2858b006
- 提交一波 · b5e40cbb
  rockyl authored Apr 28, 2020
  
  b5e40cbb
27 Apr, 2020 4 commits
- Merge branch 'dev' into res-group · 5d31f64c
  rockyl authored Apr 27, 2020
  
  5d31f64c
- Merge remote-tracking branch 'origin/dev' into dev · 77598422
  rockyl authored Apr 27, 2020
  
  77598422
- 修复冲突合并的bug · aed789d3
  rockyl authored Apr 27, 2020
  
  aed789d3
- 提交一波 · 21438934
  rockyl authored Apr 27, 2020
  
  21438934
26 Apr, 2020 1 commit
- 修复复制功能bug · 1c7c252a
  任建锋 authored Apr 26, 2020
  
  1c7c252a
24 Apr, 2020 2 commits
- Merge branch 'dev' into res-group · ceadf45d
  rockyl authored Apr 24, 2020
```
# Conflicts:
#	src/api/common.js
#	src/config.js
#	src/store/modules/project.js
#	src/utils/index.js
```
  ceadf45d
- 更新库 · cf4b7476
  rockyl authored Apr 24, 2020
  
  cf4b7476
22 Apr, 2020 1 commit
- 图集打包上传改为并行，加快速度 · a03d5cff
  rockyl authored Apr 22, 2020
  
  a03d5cff
21 Apr, 2020 1 commit
- 版本比对 · cf25f3fb
  rockyl authored Apr 21, 2020
  
  cf25f3fb
17 Apr, 2020 2 commits
- 过滤创建者 · 0b5f668e
  rockyl authored Apr 17, 2020
  
  0b5f668e
- 修改权限管理的表现形式 · 5200368d
  rockyl authored Apr 17, 2020
  
  5200368d
16 Apr, 2020 10 commits
- 合并版本冲突功能 · 93afec2d
  rockyl authored Apr 16, 2020
  
  93afec2d
- Merge branch 'code-diff' into publish · 80b3be3e
  rockyl authored Apr 16, 2020
```
# Conflicts:
#	src/locales/zh-CN.json
#	src/store/modules/project.js
#	src/views/Editor.vue
```
  80b3be3e
- 版本冲突功能 · 01406053
  rockyl authored Apr 16, 2020
  
  01406053
- Merge branch 'mvvm' into code-diff · 7e600024
  rockyl authored Apr 16, 2020
```
# Conflicts:
#	src/api/common.js
#	src/config.js
#	src/store/modules/project.js
```
  7e600024
- 去掉压缩 · f05589e1
  rockyl authored Apr 16, 2020
  
  f05589e1
- 去掉压缩 · 7cb7b6c1
  rockyl authored Apr 16, 2020
  
  7cb7b6c1
- merge · e2224b7c
  张超 authored Apr 16, 2020
  
  e2224b7c
- del length · 2e42b603
  张超 authored Apr 16, 2020
  
  2e42b603
- del length · 3d4c2bc0
  张超 authored Apr 16, 2020
  
  3d4c2bc0
- zice · 2d77c605
  张超 authored Apr 16, 2020
  
  2d77c605
15 Apr, 2020 10 commits
- Merge branch 'mvvm' into code-diff · a0f0edff
  rockyl authored Apr 15, 2020
  
  a0f0edff
- 去掉文本有色块的问题 · d53c7757
  rockyl authored Apr 15, 2020
  
  d53c7757
- 暴露文本描边属性 · 3a41f3ce
  rockyl authored Apr 15, 2020
  
  3a41f3ce
- 去掉压缩 · edd8061d
  rockyl authored Apr 15, 2020
  
  edd8061d
- -- · f411f96c
  任建锋 authored Apr 15, 2020
  
  f411f96c
- Merge branch 'publish' into auth · 710252f2
  张超 authored Apr 15, 2020
```
hebing
```
  710252f2
- 15 · ff135eb5
  张超 authored Apr 15, 2020
  
  ff135eb5
- -- · 02744b80
  任建锋 authored Apr 15, 2020
  
  02744b80
- 编辑器添加QA · 5337c8a5
  任建锋 authored Apr 15, 2020
  
  5337c8a5
- 去掉压缩 · 415229be
  rockyl authored Apr 15, 2020
  
  415229be
14 Apr, 2020 1 commit
- 合并publish · 3c50201e
  任建锋 authored Apr 14, 2020
  
  3c50201e