Commits · e60fae33f2d14811212497bbe2b609269cf0323c · 吴志俊 / kityminder-core

06 May, 2014 34 commits
- Merge branch 'dev' of github.com:fex-team/kityminder into dev · e60fae33
  Akikonata authored May 06, 2014
  
  e60fae33
- recover · 91c9bff2
  Akikonata authored May 06, 2014
  
  91c9bff2
- Merge remote-tracking branch 'origin/dev' into dev · 06532951
  campaign authored May 06, 2014
  
  06532951
- 修复undoredo所选节点未回选问题 · 1f40d528
  campaign authored May 06, 2014
  
  1f40d528
- added rendernode · aeea4585
  Akikonata authored May 06, 2014
  
  aeea4585
- Merge branch 'dev' of github.com:fex-team/kityminder into dev · 8f05ba07
  Akikonata authored May 06, 2014
  
  8f05ba07
- added rendernode · d482e4c7
  Akikonata authored May 06, 2014
  
  d482e4c7
- Merge remote-tracking branch 'origin/dev' into dev · 1c9507bf
  Ronny authored May 06, 2014
  
  1c9507bf
- 添加链接支持 · dda8fc15
  Ronny authored May 06, 2014
  
  dda8fc15
- 添加链接支持 · e17578be
  Ronny authored May 06, 2014
  
  e17578be
- added rendernode · 666cf9cb
  Akikonata authored May 06, 2014
  
  666cf9cb
- added rendernode · e50a4af2
  Akikonata authored May 06, 2014
  
  e50a4af2
- Merge branch 'dev' of github.com:fex-team/kityminder into dev · 20721c20
  Akikonata authored May 06, 2014
  
  20721c20
- test · 4aa7df2a
  Akikonata authored May 06, 2014
  
  4aa7df2a
- 修复谈层光标消失 · 5844741a
  campaign authored May 06, 2014
  
  5844741a
- Merge branch 'dev' of github.com:fex-team/kityminder into dev · 934939ea
  Akikonata authored May 06, 2014
  
  934939ea
- changed · 6b3a09ca
  Akikonata authored May 06, 2014
  
  6b3a09ca
- 添加hyperlink · 1a38a946
  campaign authored May 06, 2014
  
  1a38a946
- Merge remote-tracking branch 'origin/dev' into dev · 1cb8fe62
  campaign authored May 06, 2014
```
Conflicts:
	import.js
```
  1cb8fe62
- 添加hyperlink · 6c6eede3
  campaign authored May 06, 2014
  
  6c6eede3
- changed expand into layout · 33e58298
  Akikonata authored May 06, 2014
  
  33e58298
- added expand module · b6898c89
  Akikonata authored May 06, 2014
  
  b6898c89
- added expand all · 93298aab
  Akikonata authored May 06, 2014
  
  93298aab
- Merge branch 'dev' of github.com:fex-team/kityminder into dev · 8e876570
  Akikonata authored May 06, 2014
  
  8e876570
- added expand all · 4a24abd3
  Akikonata authored May 06, 2014
  
  4a24abd3
- 右键菜单优化 · 72fcba5d
  campaign authored May 06, 2014
  
  72fcba5d
- 更新log · 3e19e378
  campaign authored May 06, 2014
  
  3e19e378
- Merge remote-tracking branch 'origin/dev' into dev · dae4020b
  campaign authored May 06, 2014
  
  dae4020b
- 添加选中节点后可直接输入文字 · 0b05eecb
  campaign authored May 06, 2014
  
  0b05eecb
- Merge branch 'dev' of github.com:fex-team/kityminder into dev · 673fa684
  Akikonata authored May 06, 2014
  
  673fa684
- added icons · 18197e22
  Akikonata authored May 06, 2014
  
  18197e22
- Merge remote-tracking branch 'origin/dev' into dev · 57a4aa7b
  campaign authored May 06, 2014
  
  57a4aa7b
- 添加选中节点后可直接输入文字 · f8ac596f
  campaign authored May 06, 2014
  
  f8ac596f
- 修改文案 · 32b2c3cd
  Akikonata authored May 06, 2014
  
  32b2c3cd
05 May, 2014 6 commits
- Merge remote-tracking branch 'origin/dev' into dev · c40c4bf7
  campaign authored May 05, 2014
```
Conflicts:
	dialogs/preference/preference.js
```
  c40c4bf7
- 添加选中节点后可直接输入文字 · aa08b06f
  campaign authored May 05, 2014
  
  aa08b06f
- 修改dialog下的偏好设置 · 701ea9bc
  campaign authored May 05, 2014
  
  701ea9bc
- 偏好设置同步功能 · 1718064c
  techird authored May 05, 2014
  
  1718064c
- Merge branch 'dev' of https://github.com/fex-team/kityminder into dev · 0453d80a
  techird authored May 05, 2014
  
  0453d80a
- 修改成文本 · ffc41978
  campaign authored May 05, 2014
  
  ffc41978