Commits · ca6e9e0c950a6a1dbfe3fd863fd8339030a71604 · 吴志俊 / kityminder-core

17 Mar, 2014 2 commits
- Merge remote-tracking branch 'origin/dev' into dev · ca6e9e0c
  campaign authored Mar 17, 2014
```
Conflicts:
	README.md
```
  ca6e9e0c
- by zhanyi · cae8aeff
  campaign authored Mar 17, 2014
  
  cae8aeff
13 Mar, 2014 1 commit
- 线上地址更新 · fba52c76
  techird authored Mar 13, 2014
  
  fba52c76
10 Mar, 2014 13 commits
- 修复Firefox不响应mousewheel的问题 · d896284a
  techird authored Mar 10, 2014
  
  d896284a
- 抽取视野定位功能为 camera 命令 · 3d19060c
  techird authored Mar 10, 2014
  
  3d19060c
- dist · 8292538a
  techird authored Mar 10, 2014
  
  8292538a
- 分享路径修正 · 613463da
  techird authored Mar 10, 2014
  
  613463da
- 滚轮缩放功能修正 · e259696e
  techird authored Mar 10, 2014
  
  e259696e
- Chrome 不允许缩小 · e57b5a03
  techird authored Mar 10, 2014
```
Chrome缩放限制了文字的最小尺寸，导致计算错误
```
  e57b5a03
- 修正选择器拼写错误 · 5a18990c
  techird authored Mar 10, 2014
  
  5a18990c
- 添加依赖说明 · b4090db4
  techird authored Mar 10, 2014
  
  b4090db4
- Merge branch 'dev' of github.com:fex-team/kityminder into dev · fbc3749d
  techird authored Mar 10, 2014
  
  fbc3749d
- 双击功能加上状态限制 · 0d64074c
  techird authored Mar 10, 2014
  
  0d64074c
- 合并：关闭body标签 · 969ccf52
  techird authored Mar 10, 2014
  
  969ccf52
- Merge remote-tracking branch 'origin/dev' into dev · 43d3fe8a
  Jinqn authored Mar 10, 2014
  
  43d3fe8a
- 闭合body标签 · da12396d
  Jinqn authored Mar 10, 2014
  
  da12396d
07 Mar, 2014 10 commits
- 丢失的分号... · 8e903a19
  techird authored Mar 07, 2014
  
  8e903a19
- 添加自动发布脚本 · 4ed6de80
  techird authored Mar 07, 2014
  
  4ed6de80
- 禁止滚动条显示 · 6603e4d6
  techird authored Mar 07, 2014
  
  6603e4d6
- 布发 · 4ef2f0bc
  techird authored Mar 07, 2014
  
  4ef2f0bc
- 双击视野回到根节点 · 3727100e
  techird authored Mar 07, 2014
  
  3727100e
- build · 9a7104c0
  techird authored Mar 07, 2014
  
  9a7104c0
- 修复导出PNG图片时闪烁的问题 · 94f1ad8f
  techird authored Mar 07, 2014
  
  94f1ad8f
- 修复PNG图片导出bug · e221b6e4
  techird authored Mar 07, 2014
  
  e221b6e4
- 目录结构和文件调整 · 838632b3
  techird authored Mar 07, 2014
  
  838632b3
- Merge branch 'dev1.1.0' of github.com:fex-team/kityminder into dev · 9719d582
  techird authored Mar 07, 2014
  
  9719d582
06 Mar, 2014 2 commits
- Merge pull request #7 from wuliupo/dev · a7af9d1f
  techird authored Mar 06, 2014
```
Thanks @wuliupo, this is a good merge.

=======
remove dialog icon from js to css
```
  a7af9d1f
- remove dialog icon from js to css · 56bcd0ea
  Liupo Wu authored Mar 06, 2014
  
  56bcd0ea
05 Mar, 2014 3 commits
- Merge remote-tracking branch 'origin/dev1.1.0' into dev1.1.0 · c3376bce
  campaign authored Mar 05, 2014
  
  c3376bce
- by zhanyi · f9d6014d
  campaign authored Mar 05, 2014
  
  f9d6014d
- 修改grunt,实现src代码改变,自动合并压缩,并刷新页面 · 32f7afc1
  Jinqn authored Mar 05, 2014
  
  32f7afc1
04 Mar, 2014 4 commits
- by zhanyi · feef5e1b
  campaign authored Mar 04, 2014
  
  feef5e1b
- Merge branch 'dev' into dev1.1.0 · 785e4438
  campaign authored Mar 04, 2014
  
  785e4438
- by zhanyi · c86ba2e6
  campaign authored Mar 04, 2014
  
  c86ba2e6
- by zhanyi · f28a7d53
  campaign authored Mar 04, 2014
  
  f28a7d53
03 Mar, 2014 5 commits
- Merge remote-tracking branch 'origin/dev' into dev · 9e5d14b8
  campaign authored Mar 03, 2014
  
  9e5d14b8
- by zhanyi · 0a1afe41
  campaign authored Mar 03, 2014
  
  0a1afe41
- Merge pull request #3 from Jinqn/dev · 42d63d9d
  techird authored Mar 03, 2014
```
grunt合并压缩源代码
```
  42d63d9d
- grunt合并压缩源代码 · f5225f03
  Jinqn authored Mar 03, 2014
  
  f5225f03
- Merge branch 'dev1.1.0' of https://github.com/kitygraph/kityminder into dev1.1.0 · 6c0c59ce
  Akikonata authored Mar 03, 2014
  
  6c0c59ce