Commits · 560e8540b38649a60713d1f32f158abef72093a3 · 吴志俊 / kityminder-core

13 Feb, 2014 5 commits
- deleted 'highlightnode' · 560e8540
  Akikonata authored Feb 13, 2014
  
  560e8540
- changed line style · b975fd1e
  Akikonata authored Feb 13, 2014
  
  b975fd1e
- changed getData(layout) into getLayout() · 9ad9e96b
  Akikonata authored Feb 13, 2014
  
  9ad9e96b
- Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev · edb81a8e
  Akikonata authored Feb 13, 2014
  
  edb81a8e
- fixed bug · a9af083d
  Akikonata authored Feb 13, 2014
  
  a9af083d
12 Feb, 2014 35 commits
- by zhanyi · 68fb69e2
  campaign authored Feb 12, 2014
  
  68fb69e2
- by zhanyi · d285ccb7
  campaign authored Feb 12, 2014
  
  d285ccb7
- by zhanyi · 392d98e9
  campaign authored Feb 12, 2014
  
  392d98e9
- by zhanyi · 8872ad78
  campaign authored Feb 12, 2014
  
  8872ad78
- 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