Commits · ac797bf44d37a91b22c49e9f3a500f2ba6fde305 · 吴志俊 / kityminder-core

12 Feb, 2014 37 commits
- Merge remote-tracking branch 'origin/dev' into dev · ac797bf4
  campaign authored Feb 12, 2014
  
  ac797bf4
- by zhanyi · 82903074
  campaign authored Feb 12, 2014
  
  82903074
- commit · dd6cc977
  techird authored Feb 12, 2014
  
  dd6cc977
- spec · bb44a06f
  techird authored Feb 12, 2014
  
  bb44a06f
- Merge remote-tracking branch 'origin/dev' into dev · 484331d1
  campaign authored Feb 12, 2014
  
  484331d1
- by zhanyi · 73e2d84d
  campaign authored Feb 12, 2014
  
  73e2d84d
- by zhanyi · 73d08e0c
  campaign authored Feb 12, 2014
  
  73d08e0c
- fixed history bug · 9298a20b
  Akikonata authored Feb 12, 2014
  
  9298a20b
- Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev · 016b3222
  campaign authored Feb 12, 2014
  
  016b3222
- fixed history bug · a311d75d
  Akikonata authored Feb 12, 2014
  
  a311d75d
- fixed history bug · d0f3ce2b
  Akikonata authored Feb 12, 2014
  
  d0f3ce2b
- Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev · 5699f69c
  techird authored Feb 12, 2014
  
  5699f69c
- kity fix · 083a7f97
  techird authored Feb 12, 2014
  
  083a7f97
- fixed contract · 4d55616b
  Akikonata authored Feb 12, 2014
  
  4d55616b
- Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev · ece70219
  Akikonata authored Feb 12, 2014
  
  ece70219
- test · 3f9f070f
  Akikonata authored Feb 12, 2014
  
  3f9f070f
- Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev · 9980f44d
  techird authored Feb 12, 2014
```
Conflicts:
	demo/dev.html
```
  9980f44d
- 导入导出功能 · d90f302b
  techird authored Feb 12, 2014
  
  d90f302b
- by zhanyi · 14502fba
  campaign authored Feb 12, 2014
  
  14502fba
- Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev · 8e87eb5e
  Akikonata authored Feb 12, 2014
  
  8e87eb5e
- by zhanyi · 60da728d
  campaign authored Feb 12, 2014
  
  60da728d
- by zhanyi · 458f75ba
  campaign authored Feb 12, 2014
  
  458f75ba
- Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev · 4f2c9226
  Akikonata authored Feb 12, 2014
  
  4f2c9226
- fixed bug · 873f9122
  Akikonata authored Feb 12, 2014
  
  873f9122
- Merge remote-tracking branch 'origin/dev' into dev · 01df8e56
  campaign authored Feb 12, 2014
  
  01df8e56
- Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev · d91df167
  techird authored Feb 12, 2014
```
Conflicts:
	src/core/node.js
```
  d91df167
- 导入导出文档 · e4083e3a
  techird authored Feb 12, 2014
  
  e4083e3a
- by zhanyi · 88eaa1ba
  campaign authored Feb 12, 2014
  
  88eaa1ba
- added node expand and contract · d3b81471
  Akikonata authored Feb 12, 2014
  
  d3b81471
- test · 49b9cafa
  Akikonata authored Feb 12, 2014
  
  49b9cafa
- 框选删除 · edf896fe
  Akikonata authored Feb 12, 2014
  
  edf896fe
- test · 47a399be
  Akikonata authored Feb 12, 2014
  
  47a399be
- 根据 jshint 修改格式 · 596e8191
  techird authored Feb 12, 2014
```
1. 补充分号
2. for 循环里赋值语句显示加上括号
```
  596e8191
- Kity更新 · 3d817a37
  techird authored Feb 12, 2014
  
  3d817a37
- 补充全局关键字 · 245cbd4a
  techird authored Feb 12, 2014
  
  245cbd4a
- changed update · d6858fca
  Akikonata authored Feb 12, 2014
  
  d6858fca
- fixed select bug · d17305ff
  Akikonata authored Feb 12, 2014
  
  d17305ff
11 Feb, 2014 3 commits
- Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev · 158f30b6
  Akikonata authored Feb 11, 2014
  
  158f30b6
- added delete · 92a78d6f
  Akikonata authored Feb 11, 2014
  
  92a78d6f
- Merge remote-tracking branch 'origin/dev' into dev · 1fc93a5a
  campaign authored Feb 11, 2014
```
Conflicts:
	src/module/editor.receiver.js
```
  1fc93a5a