Commits · 934939ea5d6592f0b8f62eb3489fffbaad382b39 · 吴志俊 / kityminder-core

06 May, 2014 19 commits
- 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 17 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
- Merge branch 'dev' of https://github.com/fex-team/kityminder into dev · 24230ef1
  techird authored May 05, 2014
  
  24230ef1
- 添加preferencechange事件 · 75b05a77
  campaign authored May 05, 2014
  
  75b05a77
- 去了多余的preference.js · 0bea1af9
  campaign authored May 05, 2014
  
  0bea1af9
- Merge branch 'dev' of https://github.com/fex-team/kityminder into dev · 1c5ab318
  techird authored May 05, 2014
  
  1c5ab318
- 添加preference.js · 324518d3
  campaign authored May 05, 2014
  
  324518d3
- 添加preference.js · 8af508ee
  campaign authored May 05, 2014
  
  8af508ee
- 添加preference.js · 429f0e51
  campaign authored May 05, 2014
  
  429f0e51
- Merge branch 'dev' of https://github.com/fex-team/kityminder into dev · 4735257a
  techird authored May 05, 2014
  
  4735257a
- move to doc · d9aca907
  techird authored May 05, 2014
  
  d9aca907
- Merge branch 'dev' of github.com:fex-team/kityminder into dev · af830a57
  Akikonata authored May 05, 2014
  
  af830a57
- added setting · 52868ca8
  Akikonata authored May 05, 2014
  
  52868ca8
04 May, 2014 4 commits
- added lang · 146fbfc3
  Akikonata authored May 04, 2014
  
  146fbfc3
- Merge pull request #60 from zswang/dev · 79033689
  techird authored May 04, 2014
```
添加编辑节点的快捷键和菜单
```
  79033689
- 添加编辑节点的快捷键和菜单 · 83f109be
  Zswang authored May 04, 2014
  
  83f109be
- added dalog · e5e1a7f4
  Akikonata authored May 04, 2014
  
  e5e1a7f4