Commits · dae4020ba7ab0b0b0db18a2095067aa508358419 · 吴志俊 / kityminder-core

06 May, 2014 7 commits
- 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 16 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
- Merge remote-tracking branch 'origin/dev' into dev · 57ba2ba0
  campaign authored May 04, 2014
  
  57ba2ba0
- 添加preference.js · b2a4ff40
  campaign authored May 04, 2014
  
  b2a4ff40
- 添加preference.js · 5a01ff2b
  campaign authored May 04, 2014
  
  5a01ff2b
- 添加preference.js · 4ed9e476
  campaign authored May 04, 2014
  
  4ed9e476
- Merge branch 'master' of https://github.com/fex-team/kityminder into dev · f302f98b
  Zswang authored May 04, 2014
  
  f302f98b
- fixed drag bug · ce3ebde0
  Akikonata authored May 04, 2014
  
  ce3ebde0
- Merge branch 'dev' of https://github.com/fex-team/kityminder into dev · f2461c03
  campaign authored May 04, 2014
  
  f2461c03
- 更新版本为1.1.3 · 12e75a2f
  campaign authored May 04, 2014
  
  12e75a2f
- added setting icon · 9441cd83
  Akikonata authored May 04, 2014
  
  9441cd83
- 优化拖拽卡动 · da3a49ce
  campaign authored May 04, 2014
  
  da3a49ce
- rename · 5d56b76f
  Akikonata authored May 04, 2014
  
  5d56b76f
- Merge remote-tracking branch 'origin/dev' into dev · 981e1fec
  campaign authored May 04, 2014
  
  981e1fec