Commits · 2c2e2b2cb70399eafbf5b82d82f3d5309defa593 · 吴志俊 / kityminder-core

07 May, 2014 9 commits
- Merge branch 'dev' of github.com:fex-team/kityminder into dev · 2c2e2b2c
  Akikonata authored May 07, 2014
  
  2c2e2b2c
- recover history · 2da7edb5
  Akikonata authored May 07, 2014
  
  2da7edb5
- 优化了超链接的体验 · d1282765
  campaign authored May 07, 2014
  
  d1282765
- store · 6810fcd8
  Akikonata authored May 07, 2014
  
  6810fcd8
- 去掉了dialogs.css的导入 · b2102632
  campaign authored May 07, 2014
  
  b2102632
- Merge remote-tracking branch 'origin/dev' into dev · 5427c7b0
  campaign authored May 07, 2014
  
  5427c7b0
- 优化了markers的目录结构 · be565a30
  campaign authored May 07, 2014
  
  be565a30
- recover · d3a35581
  Akikonata authored May 07, 2014
  
  d3a35581
- fixed · 459155f6
  Akikonata authored May 07, 2014
  
  459155f6
06 May, 2014 31 commits
- 添加语言给unhyperlink · 972268bb
  campaign authored May 06, 2014
  
  972268bb
- Merge branch 'dev' of github.com:fex-team/kityminder into dev · b8955dbe
  Akikonata authored May 06, 2014
  
  b8955dbe
- link · 1d69ff72
  Akikonata authored May 06, 2014
  
  1d69ff72
- Merge remote-tracking branch 'origin/dev' into dev · 292e6580
  campaign authored May 06, 2014
  
  292e6580
- added link · 0aad2353
  Akikonata authored May 06, 2014
  
  0aad2353
- object不能那么直接链接过来，要clone · f1029c91
  campaign authored May 06, 2014
  
  f1029c91
- 修复dialog不能二次弹出的问题 · 75811083
  campaign authored May 06, 2014
  
  75811083
- added icons · 9e4b6698
  Akikonata authored May 06, 2014
  
  9e4b6698
- added init · e08f3cb0
  Akikonata authored May 06, 2014
  
  e08f3cb0
- Merge branch 'dev' of github.com:fex-team/kityminder into dev · 62e12516
  Akikonata authored May 06, 2014
  
  62e12516
- 更新日志 · 197058bf
  campaign authored May 06, 2014
  
  197058bf
- 更新链接按钮状态 · 792d6481
  campaign authored May 06, 2014
  
  792d6481
- 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