Commits · 5805469880e75816577ef2e594b41957f435b3df · 吴志俊 / kityminder-core

04 May, 2014 13 commits
- Merge branch 'dev' of https://github.com/fex-team/kityminder into dev · 58054698
  techird authored May 04, 2014
  
  58054698
- fix text cursor bug · 32bc331d
  techird authored May 04, 2014
  
  32bc331d
- changed position · 3d7f6dd6
  Akikonata authored May 04, 2014
  
  3d7f6dd6
- changed carc · 5d9d1daa
  Akikonata authored May 04, 2014
  
  5d9d1daa
- recoverd history points · bee5d73f
  Akikonata authored May 04, 2014
  
  bee5d73f
- Merge branch 'dev' of github.com:fex-team/kityminder into dev · 5a46c4b8
  Akikonata authored May 04, 2014
  
  5a46c4b8
- 修改光标 · a5205435
  campaign authored May 04, 2014
  
  a5205435
- recoverd history points · 36353528
  Akikonata authored May 04, 2014
  
  36353528
- kity update · 1d8b4f99
  techird authored May 04, 2014
  
  1d8b4f99
- Merge branch 'kity-2.0' of https://github.com/fex-team/kityminder into dev · f608c0ab
  campaign authored May 04, 2014
  
  f608c0ab
- Merge branch 'dev' of https://github.com/fex-team/kityminder into dev · 59ce68ec
  campaign authored May 04, 2014
  
  59ce68ec
- kity changed · dfc2cebe
  techird authored May 04, 2014
  
  dfc2cebe
- Merge branch 'dev' into kity-2.0 · fffdc644
  techird authored May 04, 2014
  
  fffdc644
03 May, 2014 3 commits
- changed layout · 348f7e12
  Akikonata authored May 03, 2014
  
  348f7e12
- added init style · 65f8ecfd
  Akikonata authored May 03, 2014
  
  65f8ecfd
- update to kity 2.0 · 9c45c334
  techird authored May 03, 2014
  
  9c45c334
02 May, 2014 2 commits
- recover icon func · 2bf0eab8
  Akikonata authored May 02, 2014
  
  2bf0eab8
- 修改语法错误 · 42b1b86a
  campaign authored May 02, 2014
  
  42b1b86a
30 Apr, 2014 11 commits
- remived switch layout · 43a50557
  Akikonata authored Apr 30, 2014
  
  43a50557
- Merge branch 'dev' of github.com:fex-team/kityminder into dev · db930917
  Akikonata authored Apr 30, 2014
  
  db930917
- added node clear · 2cb2803c
  Akikonata authored Apr 30, 2014
  
  2cb2803c
- Merge remote-tracking branch 'origin/dev' into dev · 015d8a1f
  campaign authored Apr 30, 2014
  
  015d8a1f
- 删光节点内容时，没有节点变形了 · 53a7ccc6
  campaign authored Apr 30, 2014
  
  53a7ccc6
- 优化 · 583ab19d
  Akikonata authored Apr 30, 2014
  
  583ab19d
- 优化 · 0d18502e
  Akikonata authored Apr 30, 2014
  
  0d18502e
- 优化输入文字体验 · 0a9329d1
  campaign authored Apr 30, 2014
  
  0a9329d1
- 优化输入文字体验 · fd624c72
  campaign authored Apr 30, 2014
  
  fd624c72
- Merge remote-tracking branch 'origin/dev' into dev · 715ca4ef
  campaign authored Apr 30, 2014
  
  715ca4ef
- 修复滚动时，光标不跟着移动的问题 · 9639cc69
  campaign authored Apr 30, 2014
  
  9639cc69
28 Apr, 2014 10 commits
- 修改grunt · 23a2a747
  Jinqn authored Apr 28, 2014
  
  23a2a747
- 添加zip文件解析时间戳 · 51bdc33c
  Ronny authored Apr 28, 2014
  
  51bdc33c
- 解析时间戳 · 31772818
  Ronny authored Apr 28, 2014
  
  31772818
- 添加zip文件解析时间戳 · 91949004
  Ronny authored Apr 28, 2014
  
  91949004
- 添加zip文件解压时间戳 · e1f18476
  Ronny authored Apr 28, 2014
  
  e1f18476
- 目录结构改变，grunt调整 · 40a5f5a1
  Ronny authored Apr 28, 2014
  
  40a5f5a1
- Merge branch 'dev' of https://github.com/fex-team/kityminder into dev · 88a1e04b
  campaign authored Apr 28, 2014
  
  88a1e04b
- update kity · 0fa37456
  campaign authored Apr 28, 2014
  
  0fa37456
- 修正高度的比例 · ec443445
  campaign authored Apr 28, 2014
  
  ec443445
- 添加zip文件解析时间戳 · 90b9d590
  Ronny authored Apr 28, 2014
  
  90b9d590
24 Apr, 2014 1 commit
- Merge remote-tracking branch 'origin/dev' into dev · 7ee4be5f
  campaign authored Apr 24, 2014
```
Conflicts:
	src/module/nodetext.js
```
  7ee4be5f