Commits · bf0f61347f83b5018cf6f2247c306394e010c467 · 吴志俊 / kityminder-core

18 Feb, 2014 18 commits
- Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev · bf0f6134
  techird authored Feb 18, 2014
  
  bf0f6134
- fix base offset issue · 21387f72
  techird authored Feb 18, 2014
  
  21387f72
- fixed bug · 8ac4e2ef
  Akikonata authored Feb 18, 2014
  
  8ac4e2ef
- Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev · 003f8207
  Akikonata authored Feb 18, 2014
  
  003f8207
- by zhanyi · 84da7929
  campaign authored Feb 18, 2014
  
  84da7929
- by zhanyi · ef89fc48
  campaign authored Feb 18, 2014
  
  ef89fc48
- draggable · 6c6f8514
  techird authored Feb 18, 2014
  
  6c6f8514
- ui adjust · a84f986f
  techird authored Feb 18, 2014
  
  a84f986f
- position · 938a4fe6
  Akikonata authored Feb 18, 2014
  
  938a4fe6
- merge changes · 8aedd457
  techird authored Feb 18, 2014
  
  8aedd457
- zoom · 4df655fe
  techird authored Feb 18, 2014
  
  4df655fe
- Merge remote-tracking branch 'origin/dev' into dev · d53af815
  campaign authored Feb 18, 2014
  
  d53af815
- added lang · 70fc3260
  Akikonata authored Feb 18, 2014
  
  70fc3260
- by zhanyi · f3bccfde
  campaign authored Feb 18, 2014
  
  f3bccfde
- added interactchange · 094eb0fd
  Akikonata authored Feb 18, 2014
  
  094eb0fd
- added icon menu · e1040310
  Akikonata authored Feb 18, 2014
  
  e1040310
- refract · 0a07428c
  techird authored Feb 18, 2014
  
  0a07428c
- comments · af572c11
  techird authored Feb 18, 2014
  
  af572c11
17 Feb, 2014 22 commits
- fixed bug · edec3e5a
  Akikonata authored Feb 17, 2014
  
  edec3e5a
- updated icon · 09817004
  Akikonata authored Feb 17, 2014
  
  09817004
- icons · 81f95727
  Akikonata authored Feb 17, 2014
  
  81f95727
- added queryValue · 776c3667
  Akikonata authored Feb 17, 2014
  
  776c3667
- changed cmd · c949ffd1
  Akikonata authored Feb 17, 2014
  
  c949ffd1
- Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev · f48b3d54
  Akikonata authored Feb 17, 2014
  
  f48b3d54
- added func · 230e65df
  Akikonata authored Feb 17, 2014
  
  230e65df
- drop target effect · e7bca98e
  techird authored Feb 17, 2014
  
  e7bca98e
- Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev · ce6d6e6c
  techird authored Feb 17, 2014
  
  ce6d6e6c
- by zhanyi · 772be409
  campaign authored Feb 17, 2014
  
  772be409
- Merge remote-tracking branch 'origin/dev' into dev · 6761bdd8
  campaign authored Feb 17, 2014
```
Conflicts:
	configure.js
	lang/zh-cn/zh-cn.js
```
  6761bdd8
- by zhanyi · 219afeb1
  campaign authored Feb 17, 2014
  
  219afeb1
- by zhanyi · 1c977eb9
  campaign authored Feb 17, 2014
  
  1c977eb9
- changed color · 2e7c0f6c
  Akikonata authored Feb 17, 2014
  
  2e7c0f6c
- by zhanyi · 8cdd0c12
  campaign authored Feb 17, 2014
  
  8cdd0c12
- Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev · 239ad2b7
  Akikonata authored Feb 17, 2014
  
  239ad2b7
- added 2icons · 00eb48b2
  Akikonata authored Feb 17, 2014
  
  00eb48b2
- protocal seq · 962898e9
  techird authored Feb 17, 2014
  
  962898e9
- Merge remote-tracking branch 'origin/dev' into dev · d44dd094
  campaign authored Feb 17, 2014
  
  d44dd094
- by zhanyi · 7b9be193
  campaign authored Feb 17, 2014
  
  7b9be193
- select · 29ab0dab
  techird authored Feb 17, 2014
  
  29ab0dab
- by zhanyi · 603838dd
  campaign authored Feb 17, 2014
  
  603838dd