Commits · bd0e0b804ca21d77fd6b3cc3d6be0dfb99c8e26f · Laoqifeng / zeroing-editor

13 May, 2020 1 commit
- 合并分支 · bd0e0b80
  任建锋 authored May 13, 2020
  
  bd0e0b80
12 May, 2020 1 commit
- 修复 · ed7bfeea
  rockyl authored May 12, 2020
  
  ed7bfeea
11 May, 2020 1 commit
- 完善多人协作 · b4cc384b
  rockyl authored May 11, 2020
  
  b4cc384b
09 May, 2020 2 commits
- 修复新增星速台其他页面类型无效的问题 · 925e5d79
  rockyl authored May 09, 2020
```
修复png转jpg发生错误的问题
```
  925e5d79
- 修改模板 · 5886c792
  rockyl authored May 09, 2020
  
  5886c792
08 May, 2020 1 commit
- 修改拖选工具 · 3adb8810
  任建锋 authored May 08, 2020
  
  3adb8810
07 May, 2020 3 commits
- -- · daeca6f5
  任建锋 authored May 07, 2020
  
  daeca6f5
- 修复项目列表页布局问题 · 64fca3ed
  rockyl authored May 07, 2020
  
  64fca3ed
- Merge branch 'dev' into trans-to-jpg · 58a63957
  rockyl authored May 07, 2020
  
  58a63957
06 May, 2020 2 commits
- 修复权限管理不更新的问题 · 2bfad2b0
  rockyl authored May 06, 2020
  
  2bfad2b0
- -- · 25a47f09
  任建锋 authored May 06, 2020
  
  25a47f09
03 May, 2020 2 commits
- 转换jpg功能 · 9355f0ca
  rockyl authored May 03, 2020
  
  9355f0ca
- 完成资源分组加载功能 · a067b144
  rockyl authored May 03, 2020
  
  a067b144
30 Apr, 2020 3 commits
- Merge branch 'dev' into publish_rjf · 6f151c0c
  任建锋 authored Apr 30, 2020
  
  6f151c0c
- 修改编辑器 · fb949c0c
  任建锋 authored Apr 30, 2020
  
  fb949c0c
- 保存一波 · ef9e00da
  rockyl authored Apr 30, 2020
  
  ef9e00da
29 Apr, 2020 6 commits
- 修复选择远程和本地导致丢失的问题 · dc218e9c
  rockyl authored Apr 29, 2020
  
  dc218e9c
- 保存一波 · 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
- Merge branch 'dev' into publish_rjf · 02a0882f
  任建锋 authored Apr 29, 2020
  
  02a0882f
- -- · 99b050c1
  任建锋 authored Apr 29, 2020
  
  99b050c1
28 Apr, 2020 5 commits
- Merge branch 'dev' into res-group · 5e7b8896
  rockyl authored Apr 28, 2020
  
  5e7b8896
- 冲突解决改为json拆分后解决冲突 · 2858b006
  rockyl authored Apr 28, 2020
  
  2858b006
- Merge branch 'dev' into publish_rjf · 3c21c5c8
  任建锋 authored Apr 28, 2020
  
  3c21c5c8
- -- · 011d0612
  任建锋 authored Apr 28, 2020
  
  011d0612
- 提交一波 · 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 2 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