Commits · 80b3be3e4763ddda98fb0faf8896faf87830abf1 · Laoqifeng / zeroing-editor

16 Apr, 2020 9 commits
- 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 6 commits
- 合并publish · 3c50201e
  任建锋 authored Apr 14, 2020
  
  3c50201e
- merge · 3ec924ad
  张超 authored Apr 14, 2020
  
  3ec924ad
- 14 · 88eae161
  张超 authored Apr 14, 2020
  
  88eae161
- 增加updateOperators方法 · 53b816a1
  rockyl authored Apr 14, 2020
  
  53b816a1
- -- · e7ec6f42
  任建锋 authored Apr 14, 2020
  
  e7ec6f42
- 修改发布流程 · 6b9e549e
  rockyl authored Apr 14, 2020
  
  6b9e549e
13 Apr, 2020 1 commit
- aaa · 00dd5872
  rockyl authored Apr 13, 2020
  
  00dd5872
09 Apr, 2020 1 commit
- init · 6433b9e7
  张超 authored Apr 09, 2020
  
  6433b9e7
30 Mar, 2020 1 commit
- 提交一波 · 5b6c9dde
  rockyl authored Mar 30, 2020
  
  5b6c9dde
25 Mar, 2020 1 commit
- 优化了属性栏 · 9be049cf
  rockyl authored Mar 25, 2020
  
  9be049cf
24 Mar, 2020 2 commits
- svga预览 · 7d685686
  rockyl authored Mar 24, 2020
```
素材尺寸统一管理
```
  7d685686
- 重构 · e8227960
  rockyl authored Mar 24, 2020
```
增加mvvm实现
```
  e8227960
21 Mar, 2020 2 commits
- Merge branch 'chao' into 'dev' · 34bbb913
  劳工 authored Mar 21, 2020
```
updateui

See merge request !10
```
  34bbb913
- updateui · 3478629f
  张超 authored Mar 21, 2020
  
  3478629f
19 Mar, 2020 1 commit
- 0.1版本前最后一次提交 · ef3ff29e
  rockyl authored Mar 19, 2020
  
  ef3ff29e
18 Mar, 2020 3 commits
- 本地ip变更 · d44d6943
  rockyl authored Mar 18, 2020
  
  d44d6943
- 修复星速台编辑皮肤的一些bug · ecb888ac
  rockyl authored Mar 18, 2020
  
  ecb888ac
- 显示打包时编译失败的错误信息 · 7a338bac
  rockyl authored Mar 18, 2020
  
  7a338bac
17 Mar, 2020 3 commits
- 添加删除确认弹窗 · 29a1b2fd
  任建锋 authored Mar 17, 2020
  
  29a1b2fd
- -- · d34e9ee7
  任建锋 authored Mar 17, 2020
  
  d34e9ee7
- 添加粘贴选项 · bc3ffc80
  任建锋 authored Mar 17, 2020
  
  bc3ffc80