Commits · c0597de1685e75e196deecb09029140a267e75c2 · 吴志俊 / kityminder-core

23 Dec, 2013 19 commits
- _options · c0597de1
  Akikonata authored Dec 23, 2013
  
  c0597de1
- _options · c54b4a66
  Akikonata authored Dec 23, 2013
  
  c54b4a66
- Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev · 72c028c2
  Akikonata authored Dec 23, 2013
```
Conflicts:
	demo/dev.html
```
  72c028c2
- dev · 44ecd8c8
  Akikonata authored Dec 23, 2013
  
  44ecd8c8
- merge 2 · f3cc4c73
  techird authored Dec 23, 2013
  
  f3cc4c73
- merge from panzheng · 3cd99103
  techird authored Dec 23, 2013
  
  3cd99103
- update kity · 9a66a05c
  techird authored Dec 23, 2013
  
  9a66a05c
- dev · 05069fe2
  techird authored Dec 23, 2013
  
  05069fe2
- dev · 3bf2700e
  Akikonata authored Dec 23, 2013
  
  3bf2700e
- dev · 3cb3e8bc
  Akikonata authored Dec 23, 2013
  
  3cb3e8bc
- dev · 94ba87d1
  Akikonata authored Dec 23, 2013
  
  94ba87d1
- added _getCommand&&getQuery · 360c83bf
  Akikonata authored Dec 23, 2013
  
  360c83bf
- src adjust · 8b8945db
  techird authored Dec 23, 2013
  
  8b8945db
- 拆分minder.js · 196addf0
  techird authored Dec 23, 2013
  
  196addf0
- Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev · 23920e31
  techird authored Dec 23, 2013
  
  23920e31
- dev · 82bfdd81
  Akikonata authored Dec 23, 2013
  
  82bfdd81
- rename cancel to stopPropagation · 163c528d
  techird authored Dec 23, 2013
  
  163c528d
- dev · 313cfc12
  Akikonata authored Dec 23, 2013
  
  313cfc12
- dev · ae6c0298
  Akikonata authored Dec 23, 2013
  
  ae6c0298
20 Dec, 2013 15 commits
- dev · ae81c95e
  Akikonata authored Dec 20, 2013
  
  ae81c95e
- Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev · 6fbd73c8
  Akikonata authored Dec 20, 2013
```
Conflicts:
	src/core/kityminder.js
```
  6fbd73c8
- dev · 469d5306
  Akikonata authored Dec 20, 2013
  
  469d5306
- History Module · 8b7c0bfa
  techird authored Dec 20, 2013
  
  8b7c0bfa
- deleted extra files · 0718e9b6
  Akikonata authored Dec 20, 2013
  
  0718e9b6
- merge conflict · 901b665d
  Akikonata authored Dec 20, 2013
  
  901b665d
- dev · cc79a59d
  Akikonata authored Dec 20, 2013
  
  cc79a59d
- expose getRenderContainer() · 6d54ebe4
  techird authored Dec 20, 2013
  
  6d54ebe4
- Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev · 6e79243c
  techird authored Dec 20, 2013
```
Conflicts:
	minder_module/module.render.js
```
  6e79243c
- Format Files · ad872831
  techird authored Dec 20, 2013
  
  ad872831
- Module Example · 65b73774
  techird authored Dec 20, 2013
  
  65b73774
- 添加 KityMinder 到开发全局变量 · 8402f4c8
  techird authored Dec 20, 2013
  
  8402f4c8
- 测试模块移除 · 60ab901b
  techird authored Dec 20, 2013
  
  60ab901b
- 模块文件建立 · 6f071fef
  techird authored Dec 20, 2013
  
  6f071fef
- added a func · 599d15fc
  Akikonata authored Dec 20, 2013
  
  599d15fc
19 Dec, 2013 6 commits
- dev · 4ce2e79a
  Akikonata authored Dec 19, 2013
  
  4ce2e79a
- Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev · a811bc78
  Akikonata authored Dec 19, 2013
```
Conflicts:
	minder_module/module.default.test.js
```
  a811bc78
- dev · 3e646f89
  Akikonata authored Dec 19, 2013
  
  3e646f89
- beautify · d0c4d013
  techird authored Dec 19, 2013
  
  d0c4d013
- solve · 6c1715b3
  techird authored Dec 19, 2013
  
  6c1715b3
- beautify · 13e44a41
  techird authored Dec 19, 2013
  
  13e44a41