merge
Merge branch 'dev' of github.com:kitygraph/kityminder into dev
many changes

commit 9b1102af5d8160578fda6090126935a12cd4af30
Author: techird <techird@qq.com>
Date:   Sun Feb 16 02:22:24 2014 +0800

    drag tree

commit 9d4d2d4497a27086904f2f83dac3c4eb58016525
Author: techird <techird@qq.com>
Date:   Sat Feb 15 15:39:09 2014 +0800

    重构select

commit e40b032280d4f252adc1530691b0fcd387fa5f48
Merge: c9c9157 7c060bf
Author: techird <techird@qq.com>
Date:   Fri Feb 14 17:43:36 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit c9c91572c3d5a0fc5a9eaf8a1d3243bd1ed81214
Author: techird <techird@qq.com>
Date:   Fri Feb 14 17:43:09 2014 +0800

    import

commit 7c060bf0d20b7985c45aa8103646baa9824a8e1c
Merge: 6475e1b 1566b26
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Feb 14 17:13:58 2014 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 6475e1bcf58db0edfe353abd073154162aaaba1b
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Feb 14 17:12:31 2014 +0800

    by zhanyi

commit 1566b267a93e68a2da96938b9a1287d368ebc9ec
Author: techird <techird@qq.com>
Date:   Fri Feb 14 17:08:57 2014 +0800

    dev

commit 22de9999d583645ff1397ea0c546874c549d67ba
Merge: 02bf737 bd29680
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Feb 14 16:11:52 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit bd29680254baf051123eebd0c04c9e94ac9d9960
Author: techird <techird@qq.com>
Date:   Fri Feb 14 16:10:12 2014 +0800

    dev

commit 02bf7378cc0267edcd8ecc668af01ac9113ff1e1
Merge: 1854c29 677aeef
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Feb 14 16:09:16 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit 677aeef72f66860bf2555021e82d94f9d9c2bfcb
Author: techird <techird@qq.com>
Date:   Fri Feb 14 16:02:06 2014 +0800

    ui

commit 1854c29d14e32b1c6cc670d5b089b70f45f16bfb
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Feb 14 16:01:50 2014 +0800

    by zhanyi

commit ff767e184d899a7fd628f9b8881e3485c13ff40d
Merge: 7e55972 cd9a594
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Feb 14 14:17:10 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit 7e559721af4d282eda6481d91a155468025a3fba
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Feb 14 14:16:29 2014 +0800

    by zhanyi

commit cd9a594f5c81f449465c3ae18aa6f219950c4198
Author: techird <techird@qq.com>
Date:   Fri Feb 14 14:08:35 2014 +0800

    navigate bug fix

commit 02af05d8908ebba445f3d229ae234f24cceceb42
Author: techird <techird@qq.com>
Date:   Fri Feb 14 13:59:44 2014 +0800

    arrange

commit a9274b388846c9e49f8f94aef0da1dd54aba36d9
Author: techird <techird@qq.com>
Date:   Fri Feb 14 13:33:35 2014 +0800

    ui optimize

commit 02111ec9421be2282d8fa52d578357d140f7a1ab
Author: techird <techird@qq.com>
Date:   Fri Feb 14 13:20:01 2014 +0800

    ui optimize

commit 26ada3ab684e822d27935e05f57a88e6f8e24473
Author: techird <techird@qq.com>
Date:   Fri Feb 14 13:14:06 2014 +0800

    ui optimize

commit 9e0d0b6924238555c683e856e51a7bf8c739d883
Author: techird <techird@qq.com>
Date:   Fri Feb 14 12:47:53 2014 +0800

    save to

commit d66345b008c8fcfb50125d716f88ffcf8ba1952a
Author: techird <techird@qq.com>
Date:   Thu Feb 13 19:28:15 2014 +0800

    ui optimize

commit b5cbafb8bb714a31d42d6bcc44784a82ec58c916
Author: techird <techird@qq.com>
Date:   Thu Feb 13 19:05:45 2014 +0800

    ui update

commit 490352713bedb4329ecc75709fcc65581b339843
Merge: a4b3a6f 741c25b
Author: techird <techird@qq.com>
Date:   Thu Feb 13 18:27:51 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit a4b3a6f88761b7582c9ba3a17454912e1478833b
Author: techird <techird@qq.com>
Date:   Thu Feb 13 18:27:23 2014 +0800

    hand

commit 320552b49f110791e6a6e68587aa878eefd7bb26
Author: techird <techird@qq.com>
Date:   Thu Feb 13 18:25:57 2014 +0800

    ui optimize

commit 741c25b9ce887acd61cca74717e98dfaf6dddc4c
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 17:03:49 2014 +0800

    by zhanyi

commit 212a4e8c554377cb0be4093a22ea7749025bc0f2
Merge: 8d13414 60a0ff9
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 16:29:08 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit 8d134143a6918155c0ef402df7e44faa36680b78
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 16:28:59 2014 +0800

    by zhanyi

commit 60a0ff9e3ec784aeaf826e4a97b8f24b2ba117fd
Author: techird <techird@qq.com>
Date:   Thu Feb 13 16:03:36 2014 +0800

    ui

commit 6cee6acf69585fcb9e2261f2bc626a950fc8f6f6
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 15:41:20 2014 +0800

    by zhanyi

commit 1724ab594b3ed539843f4a42fd9fc592bb84fec6
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 14:15:58 2014 +0800

    by zhanyi

commit 7af2f5bdf1864b71ca0206c305b49c986eabaede
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 14:11:05 2014 +0800

    by zhanyi

commit 1a36d3619166905dfa89c05804b4a47448e0c6b6
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 13:50:44 2014 +0800

    by zhanyi

commit 5bef8d682cda8c3f78cb09187ab4a517822ff789
Merge: 781e870 c4ca088
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 13:47:10 2014 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 781e8706b61cab5d180cea7a5ed10243f9906408
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 13:45:46 2014 +0800

    by zhanyi

commit 7d95683e40d79f0d56dac7cbe5833e0b6df51f58
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 13:42:04 2014 +0800

    by zhanyi

commit c4ca08846c4bf1b79695e16e7ac9cce1242a453d
Author: Akikonata <66875692@qq.com>
Date:   Thu Feb 13 13:39:07 2014 +0800

    fixed bug

commit fd1779cc47e4091a7776c5332fe668fb87bd9694
Merge: 342ffba 22e0fbe
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 13:35:48 2014 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 22e0fbeb9acd349b056d908c5840eae16a9fce98
Merge: 560e854 40452f1
Author: Akikonata <66875692@qq.com>
Date:   Thu Feb 13 13:34:50 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit 342ffba95906248f2f241cee694a68b70924599e
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 13:34:42 2014 +0800

    by zhanyi

commit 560e8540b38649a60713d1f32f158abef72093a3
Author: Akikonata <66875692@qq.com>
Date:   Thu Feb 13 13:34:23 2014 +0800

    deleted 'highlightnode'

commit 40452f1b6228d70cebe86908a597a9ea33597cdd
Author: techird <techird@qq.com>
Date:   Thu Feb 13 13:24:34 2014 +0800

    kity update

commit 3b84cf06b3e6a3ca6187091bd957f6d43cf5df36
Author: techird <techird@qq.com>
Date:   Thu Feb 13 12:56:29 2014 +0800

    界面简单整理

commit b975fd1e39a7a539c6b6749f6692914a504168c4
Author: Akikonata <66875692@qq.com>
Date:   Thu Feb 13 12:42:00 2014 +0800

    changed line style

commit 9ad9e96b1372fce57d5cac1ff3f086d653897af4
Author: Akikonata <66875692@qq.com>
Date:   Thu Feb 13 12:03:58 2014 +0800

    changed getData(layout) into getLayout()

commit edb81a8e36d46ccf886ae234fb87305d1f9be3a2
Merge: a9af083 68fb69e
Author: Akikonata <66875692@qq.com>
Date:   Thu Feb 13 11:27:46 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit a9af083d42374e3d21f4ab9892fc89d740817634
Author: Akikonata <66875692@qq.com>
Date:   Thu Feb 13 11:27:29 2014 +0800

    fixed bug

commit 68fb69e24a0823956fc8c2aaaa685ce47b907c99
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 01:31:16 2014 +0800

    by zhanyi

commit d285ccb75be64cf9eb81423d4a3e39731d1a7761
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 01:29:08 2014 +0800

    by zhanyi

commit 392d98e97e21d8b2242c34508f896f38f94e8694
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 00:59:30 2014 +0800

    by zhanyi

commit 8872ad787321a9df847377bd2026c1aee3a17e1a
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 00:26:26 2014 +0800

    by zhanyi

commit ac797bf44d37a91b22c49e9f3a500f2ba6fde305
Merge: 8290307 dd6cc97
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 00:17:01 2014 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 82903074affdb5d8293c77a1a2467d2ab32fac65
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 13 00:16:18 2014 +0800

    by zhanyi

commit dd6cc977911dcca1963e3be1525cce6bb39b6e9f
Author: techird <techird@qq.com>
Date:   Wed Feb 12 23:45:38 2014 +0800

    commit

commit bb44a06f607746e75ce991f9669372ced8074b0a
Author: techird <techird@qq.com>
Date:   Wed Feb 12 21:19:51 2014 +0800

    spec

commit 484331d1009b2bd537a78898d340b0b0dd46ac1e
Merge: 73e2d84 9298a20
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 12 20:25:32 2014 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 73e2d84d7353975af46df6a38acc395c24e6e6c2
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 12 20:24:48 2014 +0800

    by zhanyi

commit 73d08e0c72bc2282cd1ca43e85737873182aa504
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 12 20:24:30 2014 +0800

    by zhanyi

commit 9298a20b56011287fbf6ff485f5e3b9404ad5f7f
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 20:15:27 2014 +0800

    fixed history bug

commit 016b3222b0c5b6bcd4e0fa344749b3f25ba09875
Merge: 14502fb d0f3ce2
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 12 20:14:59 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit a311d75da259f586663f9c96e477590df999e17c
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 20:14:59 2014 +0800

    fixed history bug

commit d0f3ce2b6255ef9d9021cc5045b08b01c4dd8af7
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 20:12:58 2014 +0800

    fixed history bug

commit 5699f69c3d6cee6559ca5093df3c0fed747c9f85
Merge: 083a7f9 4d55616
Author: techird <techird@qq.com>
Date:   Wed Feb 12 19:30:40 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit 083a7f978005319770befdb4304219ff6d79608c
Author: techird <techird@qq.com>
Date:   Wed Feb 12 19:29:42 2014 +0800

    kity fix

commit 4d55616b7b661d804517e7c28ad8b2f41ab62d30
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 18:49:07 2014 +0800

    fixed contract

commit ece702198056b0b08621c19b8e927d1da763b75f
Merge: 3f9f070 9980f44
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 18:30:49 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit 3f9f070f004bdf57275160efc5e2e48df788d0c3
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 18:30:30 2014 +0800

    test

commit 9980f44de7aa6bf30c15a367812a27c070986549
Merge: d90f302 60da728
Author: techird <techird@qq.com>
Date:   Wed Feb 12 18:09:55 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

    Conflicts:
    	demo/dev.html

commit d90f302bc6663fbeb045cb2880f290ce5e009009
Author: techird <techird@qq.com>
Date:   Wed Feb 12 18:08:53 2014 +0800

    导入导出功能

commit 14502fba030fea99d0d88238907be62fa084a5c4
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 12 16:55:17 2014 +0800

    by zhanyi

commit 8e87eb5e044ca1cd95695fcb2e36ca112c257f17
Merge: 4f2c922 60da728
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 16:13:59 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit 60da728da35c4015c641ffba5fb121d4526b0617
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 12 16:13:24 2014 +0800

    by zhanyi

commit 458f75baa9d97736c64fa02f35687ffef0b15d4e
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 12 16:13:13 2014 +0800

    by zhanyi

commit 4f2c92264fff9a54ed035b68e42e0609bcca6ee2
Merge: 873f912 01df8e5
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 16:12:55 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit 873f9122045e8b44c6efbf0fe20bca33eb624905
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 16:12:15 2014 +0800

    fixed bug

commit 01df8e563afaf1e1e85fe200eb46561315105bef
Merge: 88eaa1b d91df16
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 12 16:05:37 2014 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit d91df1679dcb827fc518d60045b9b4b0af972303
Merge: e4083e3 d3b8147
Author: techird <techird@qq.com>
Date:   Wed Feb 12 15:20:46 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

    Conflicts:
    	src/core/node.js

commit e4083e3a545e395df940c76704932d0c4e6baf9d
Author: techird <techird@qq.com>
Date:   Wed Feb 12 15:19:09 2014 +0800

    导入导出文档

commit 88eaa1bac4748771b5c62d03f207c8dfaac4258e
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 12 15:18:44 2014 +0800

    by zhanyi

commit d3b81471c0f2f7897f426195e471af6f06a2a9ac
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 14:56:32 2014 +0800

    added node expand and contract

commit 49b9cafa3db1b372780a18b0e3e933d009614bc4
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 13:58:06 2014 +0800

    test

commit edf896fe8fbf337f660cf7d995f4c88d02bae0cd
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 13:38:13 2014 +0800

    框选删除

commit 47a399beafbeb60724c268d0b243058ff2b03f61
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 12:47:44 2014 +0800

    test

commit 596e8191693d0cdf3ff570c3d0afab2e383d3971
Author: techird <techird@qq.com>
Date:   Wed Feb 12 11:18:02 2014 +0800

    根据 jshint 修改格式

    1. 补充分号
    2. for 循环里赋值语句显示加上括号

commit 3d817a37018f887c2c2effc21cc726b844b5eb99
Author: techird <techird@qq.com>
Date:   Wed Feb 12 11:17:14 2014 +0800

    Kity更新

commit 245cbd4a545c955f73051aa6668242198d8c99d0
Author: techird <techird@qq.com>
Date:   Wed Feb 12 11:17:04 2014 +0800

    补充全局关键字

commit d6858fcaae5f517b6bf0865bbd4d6cac6a6b9808
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 09:31:30 2014 +0800

    changed update

commit d17305ff9d28a965eb495375f9c0ae591a627b90
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 12 08:17:43 2014 +0800

    fixed select bug

commit 158f30b61aa5c80a2fddc511a6dd5bc72d4e5727
Merge: 92a78d6 1fc93a5
Author: Akikonata <66875692@qq.com>
Date:   Tue Feb 11 23:18:39 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit 92a78d6fc7b2de9be9da10e73d18c7a0b26123f5
Author: Akikonata <66875692@qq.com>
Date:   Tue Feb 11 23:18:13 2014 +0800

    added delete

commit 1fc93a5a3547c8d3573675edd953933476f14d31
Merge: 7e201ac b4f2e3d
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 11 20:54:09 2014 +0800

    Merge remote-tracking branch 'origin/dev' into dev

    Conflicts:
    	src/module/editor.receiver.js

commit 7e201acea439a8e772ab663d4d3dcac8ff358d07
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 11 18:54:04 2014 +0800

    by zhanyi

commit b4f2e3db2b10889c145110d817bdade44327d85b
Author: Akikonata <66875692@qq.com>
Date:   Tue Feb 11 18:45:48 2014 +0800

    update layout

commit 4f1c2691e67651823f9ed7639471caca51be9c61
Merge: fbae7bf a30376a
Author: Akikonata <66875692@qq.com>
Date:   Tue Feb 11 16:47:10 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit a30376a77d44d066ad71763f14c4d8968e78dccf
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 11 16:46:27 2014 +0800

    by zhanyi

commit fbae7bf0f7ac79135c2a6bd0e04c0b6c2dfced8e
Merge: c91f947 69cb9cc
Author: Akikonata <66875692@qq.com>
Date:   Tue Feb 11 16:45:39 2014 +0800

    merge conflict

commit c91f947236aaf046272a752425509ac4e70f1891
Author: Akikonata <66875692@qq.com>
Date:   Tue Feb 11 16:44:02 2014 +0800

    test

commit 47d3b6f5e6eb8577210fa7fc58a7a308c9b26e96
Author: Akikonata <66875692@qq.com>
Date:   Tue Feb 11 16:42:52 2014 +0800

    重构

commit 69cb9cc4cc2986443675d4748dfe8b2e4bee4320
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 11 15:32:27 2014 +0800

    by zhanyi

commit cbfcc958063c53cd9967264a8d45ec616fca7b55
Merge: d35bab8 6b68f6e
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Feb 10 23:05:05 2014 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit d35bab8fc3829d816d06d4f7c1733b270bee0171
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Feb 10 23:04:38 2014 +0800

    by zhanyi

commit beee354aed5fcdf7a1bbb546860e2c0b9c11437f
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Feb 10 23:03:53 2014 +0800

    by zhanyi

commit fd752eb7c4bd94c251816b1108ac1b2ee2b5eecf
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Feb 10 23:03:39 2014 +0800

    by zhanyi

commit b6fdbd8cd3a15920bac6e9e3e05e9471c24ac0d9
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Feb 10 23:02:46 2014 +0800

    by zhanyi

commit a9bb28c36932fdd83c433408a8df21b4f4c42bc2
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Feb 10 23:02:31 2014 +0800

    by zhanyi

commit 6b68f6ec045689360c3201d00e30ff03bf3caa50
Author: Akikonata <66875692@qq.com>
Date:   Mon Feb 10 12:43:20 2014 +0800

    fixed the bug of beforeRenderNode

commit 6438da2d8e285e6e5d2e1435bf0996bffdcc6a36
Author: Akikonata <66875692@qq.com>
Date:   Sun Feb 9 14:55:28 2014 +0800

    new style

commit fe1c871ea2c117887b47f34e702afe479edf83b9
Author: Akikonata <66875692@qq.com>
Date:   Sun Feb 9 14:28:44 2014 +0800

    renamed style

commit 07b304fc85d38e2f479326bb89d3091430c1cb12
Author: Akikonata <66875692@qq.com>
Date:   Sun Feb 9 14:28:14 2014 +0800

    renamed style

commit 99cadfca1a881d3b909c2e9f53b10687824e3221
Author: Akikonata <66875692@qq.com>
Date:   Sun Feb 9 13:24:43 2014 +0800

    fixed green style bug

commit 0ba2c85edb1af4af112fd14a165a32a26246484b
Merge: dfcaf65 1cf019b
Author: Akikonata <66875692@qq.com>
Date:   Sat Feb 8 11:07:17 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit dfcaf65bb6dc56737c43320f40548af5a2bf9619
Author: Akikonata <66875692@qq.com>
Date:   Sat Feb 8 11:03:37 2014 +0800

    fixed bug

commit 1cf019b797b250bb5b7679ab81a5bc8c44ccc54a
Author: campaign <zhanyi1022@gmail.com>
Date:   Sat Feb 8 01:45:07 2014 +0800

    by zhanyi

commit 532153c8e728a9a8483d65dc80d9d54f055e5b05
Author: campaign <zhanyi1022@gmail.com>
Date:   Sat Feb 8 01:29:54 2014 +0800

    by zhanyi

commit f4caeabbbf66fe8df20b2f014a3388a4df087cfe
Author: campaign <zhanyi1022@gmail.com>
Date:   Sat Feb 8 01:06:49 2014 +0800

    by zhanyi

commit 8cf56d08a9387dfe99c255cc0d64f82183f4c43b
Merge: 970939e 0537e3e
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Feb 7 21:48:21 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit 0537e3e0951c40bd4a856c0f56b432ded1c3862b
Author: Akikonata <66875692@qq.com>
Date:   Fri Feb 7 18:31:57 2014 +0800

    fixed bug

commit 73e6aaa771375d083014e9818819f44598ab1d84
Author: Akikonata <66875692@qq.com>
Date:   Fri Feb 7 17:52:42 2014 +0800

    changed structure

commit 970939ec792f84d669986ff22da01b4bcb7b37ba
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Feb 7 17:39:53 2014 +0800

    by zhanyi

commit ea78ac1dddebde6c35fbb95fb616b7c483b83d98
Author: Akikonata <66875692@qq.com>
Date:   Fri Feb 7 17:24:31 2014 +0800

    added event

commit 7ee022959f7aee89172e2ca57a04337790115510
Merge: e09fd16 b78aaca
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Feb 7 15:49:30 2014 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit e09fd163900afecdab4f9ac8d0ea7e9bd3e7f14e
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Feb 7 15:45:49 2014 +0800

    by zhanyi

commit b78aaca2d9a739b7bbe7a342d1e293cac98b079b
Merge: a18615c 95d27ab
Author: Akikonata <66875692@qq.com>
Date:   Fri Feb 7 15:39:14 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit a18615c0076de0ce5cbc80c0188b21a06e4ae0ca
Author: Akikonata <66875692@qq.com>
Date:   Fri Feb 7 15:38:03 2014 +0800

    test

commit b7a9e9474555ccc26d03ec850fd2cc9b61f86dfa
Author: Akikonata <66875692@qq.com>
Date:   Fri Feb 7 15:35:17 2014 +0800

    added node event

commit 95d27ab5669d56618e0aa17294d0ee98942524a1
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Feb 6 18:13:51 2014 +0800

    by zhanyi

commit dc2ad4be1c85186810bc6f00096cfb820adbcc01
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 5 16:26:08 2014 +0800

    by zhanyi

commit aeef6b0ce894bd11af2308170b51fdf5fa396630
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 5 15:29:58 2014 +0800

    by zhanyi

commit 9a36e6be5d52e36b62d40832256ae5c37f029a64
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 5 14:38:12 2014 +0800

    by zhanyi

commit d16bcc7aab40b5c266a8eed09f0abdad3ecb9187
Merge: 408f2ed 476dd4c
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 5 14:35:11 2014 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 476dd4c3a8a26838892764f4690356ce1d28c6c9
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 5 14:20:41 2014 +0800

    changed select

commit 408f2ed03cbcb3e9849a5c4c9b351117602ee20a
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 5 14:15:52 2014 +0800

    by zhanyi

commit c1eaf6c86685399cfdf8e1f6e443c96267376ae6
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 5 14:09:06 2014 +0800

    added node

commit b56076a1e1f9ce0f8ef5f11efcb64feb3fd02596
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 5 14:07:48 2014 +0800

    added judge

commit ca15319e2d589cac041f72f59d020f3507fb0656
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Feb 5 13:58:50 2014 +0800

    by zhanyi

commit 5eb680c076590615cee2c414c5989e7e78ab3764
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 5 13:52:48 2014 +0800

    remove select

commit b89dda2bf36203d260daecd93cc03d3ae2add98a
Author: Akikonata <66875692@qq.com>
Date:   Wed Feb 5 13:29:39 2014 +0800

    select root

commit cf4ee9a03242e5ade00f421c4ef445aec929af52
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 17:18:40 2014 +0800

    by zhanyi

commit 0181e1e5b0c5f4095f3703fd5c9431d57854d393
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 17:13:49 2014 +0800

    by zhanyi

commit 0df7b9165b23c2ae52e1a374f5a39fb9f11dd762
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 17:01:52 2014 +0800

    by zhanyi

commit 533ef8e4feff59f858ac3c34b7e0217942454063
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 16:19:49 2014 +0800

    by zhanyi

commit 0de26c44f2fa2363ea98ea0c97b742c48c56a4da
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 16:00:58 2014 +0800

    by zhanyi

commit bdfe210e4ba1e527acbefad11ed20af40a9fecbe
Merge: 2cb3595 5da9a4a
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 15:48:04 2014 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 2cb3595389d4dffb38e7a99b2ce10cd99248214e
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 15:46:54 2014 +0800

    by zhanyi

commit 5da9a4aadee0b41f0b11fc34bba0686b8a577a24
Author: Akikonata <66875692@qq.com>
Date:   Tue Feb 4 15:41:30 2014 +0800

    fixed bug

commit 7ee1cf2095427c934feecbd05a464457d59a4c41
Author: Akikonata <66875692@qq.com>
Date:   Tue Feb 4 15:35:48 2014 +0800

    added node move

commit 10f21447c6bba53b9763ecbaedae0f2bb5d24fce
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 15:07:57 2014 +0800

    by zhanyi

commit 282c39700b310c103e44f44e50a05f618c968780
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 15:07:31 2014 +0800

    by zhanyi

commit b4238c81cd0fec4e4d711497c20c7f585f356c35
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 15:04:25 2014 +0800

    by zhanyi

commit 30e37603d08851d60b611408b5b20687699e07e4
Merge: d5ae859 7ae2c4e
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 14:54:18 2014 +0800

    by zhanyi

commit d5ae859953230fc049c6e4c86d02d95208add8d0
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 14:47:06 2014 +0800

    by zhanyi

commit 65a9774317cf11c6846f56d63d0c26449e633563
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 14:46:56 2014 +0800

    by zhanyi

commit 7ae2c4e54582edc58378036461c490f0ac35b6a3
Author: Akikonata <66875692@qq.com>
Date:   Tue Feb 4 14:25:56 2014 +0800

    added updateLayout

commit b88195efb228040326803b33c43f2e9ba72f7ccc
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 14:25:20 2014 +0800

    by zhanyi

commit cb3b550be0f7c5eaf2b9236827e863e79fd9b8ce
Author: Akikonata <66875692@qq.com>
Date:   Tue Feb 4 14:18:32 2014 +0800

    test

commit ed8860bfbef293d14590c99e9f5a28e3d0be491e
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 14:14:24 2014 +0800

    by zhanyi

commit 6a811fe92777666c52336e13f68a8330d8d1eac3
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 14:12:18 2014 +0800

    by zhanyi

commit 37e682fb29a0e37c07e6f5616d411cb15389196f
Merge: 37f7f35 71d59ae
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 14:03:20 2014 +0800

    by zhanyi

commit 37f7f353f009c3c39fabaea58651d47ea47f78a0
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Feb 4 13:59:34 2014 +0800

    添加编辑功能

commit 71d59ae0c0b3ac28cddc5b32579b39da4b7cee32
Author: Akikonata <66875692@qq.com>
Date:   Sun Feb 2 04:18:01 2014 +0800

    added show and hide

commit 81416b00bab8293aed553c16aa40a59065174152
Author: Akikonata <66875692@qq.com>
Date:   Sun Feb 2 04:12:00 2014 +0800

    added show and hide

commit 2e9e68b6852a77da5fe2f5ed89be1c8534b81e73
Author: Akikonata <66875692@qq.com>
Date:   Sun Feb 2 03:33:37 2014 +0800

    added shicon

commit c9d67aef6656781029c7595b7f6186a834576c5b
Author: Akikonata <66875692@qq.com>
Date:   Sat Feb 1 06:36:50 2014 +0800

    changed style

commit e48a1ef061aed76faff4550afc787709a1417f9d
Author: Akikonata <66875692@qq.com>
Date:   Sat Feb 1 05:06:45 2014 +0800

    changed style

commit d5fa216f009a0517fc59e2b3e7ac545763d95072
Author: Akikonata <66875692@qq.com>
Date:   Sat Feb 1 05:03:57 2014 +0800

    changed style

commit 67ad6bd874b90c8e487f5794dda752490ed48a63
Author: Akikonata <66875692@qq.com>
Date:   Sat Feb 1 04:37:49 2014 +0800

    changed style

commit 3c8d48b11d3b3a08b9a0988fc89371ca4962da65
Author: Akikonata <66875692@qq.com>
Date:   Sat Feb 1 04:07:37 2014 +0800

    changed shape

commit 2dd1b800d911a2caadba0b703b6505f409ded5a0
Author: Akikonata <66875692@qq.com>
Date:   Thu Jan 30 16:48:44 2014 +0800

    changed style

commit c075025fd1d8b3a3eb5bdcfbfc030430a18cbc7e
Merge: c20aca3 a537a5f
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 27 18:55:00 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit c20aca3642ba3f808ec1994330dab1df3f933913
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 27 18:54:48 2014 +0800

    test

commit 7eae9dddfbd0d9920774462ba69eace820bad728
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 27 13:38:36 2014 +0800

    added new data

commit a537a5ff55b79ded5730737921b8be0430c223d5
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 24 20:10:46 2014 +0800

    by zhanyi

commit 40829511904417274631d34057ce785261ec586d
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 24 20:06:48 2014 +0800

    by zhany

commit aba6baec23098332f72cd9203ddcdaefdb68a57a
Merge: 54d0903 b96701d
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 24 20:01:55 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit 54d0903c430cc382e8ad213b89d856ac3d743a3b
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 24 20:01:40 2014 +0800

    by zhanyi

commit b96701df39a09c030acf0e1d2a95c08db4e78148
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 24 17:50:51 2014 +0800

    added select

commit 40b114a2dcc3ecb90a522798fffc7be5362aea5f
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 24 17:21:40 2014 +0800

    fixed the bug of selecting nodes

commit 290f13392b47d68956c5c99fc2cc146eaebfa213
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 24 15:32:09 2014 +0800

    fixed layout bug

commit 39b21a35e0f6fd62d73218476aa13fd0caf3febb
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 24 14:34:47 2014 +0800

    添加removeSelectedNodes方法

commit 2c4bd20a9a4880c7afbbef153be38974f6b28152
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 24 14:30:42 2014 +0800

    修改了select功能

commit 1a6a1dce42f00c3e1b6f8e74ae3eb13ab4720230
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 24 13:37:39 2014 +0800

    utils 添加getNodeCommonAncestor

commit c8922806d7321b5910883e40f53d0c21d4cb0a9b
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 24 13:24:46 2014 +0800

    added render node

commit 7b35e074eed6ec1cd8128011706c80508c5d59fd
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 24 01:30:29 2014 +0800

    fixed bug

commit e9cd07b2939c4cc969dc893b217af078f9d02c5c
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 24 00:34:28 2014 +0800

    fixed bug

commit d2a737a282e0ed467c2d39b9d1db6cab04bd9539
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 24 00:25:50 2014 +0800

    fixed bug

commit bb8b03c00b47793cf57c7b00774f1786410732f6
Author: Akikonata <66875692@qq.com>
Date:   Thu Jan 23 19:31:02 2014 +0800

    added multiselect

commit 2bbb3cde4210700f184c0143df31133cf3d89a42
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 22 18:25:49 2014 +0800

    fixed bug

commit ebb2c77ef1d0e84b34d5c48fdbf383bc8b0f11b5
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 22 16:44:37 2014 +0800

    store

commit af02c5c12021f80dad291fa41ca7a450f9e42fe8
Merge: 657e8a8 02ac206
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Jan 22 16:27:38 2014 +0800

    by zhanyi

commit 02ac2067a9cb41635ef3d92478c9ca9ca9873372
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 22 15:57:21 2014 +0800

    changed funcs

commit 657e8a8d458082c0c305bc8893facb1b8b77eea7
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Jan 22 15:25:13 2014 +0800

    添加setPoint,getPoint方法

commit ae46c37dbaa508a6268cd0d0b5ddec424866f755
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 22 13:07:39 2014 +0800

    fixed the undo and redo

commit 5e59c39cc2547f5edad169ca974176c71009c23f
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 22 02:38:12 2014 +0800

    added select

commit 17d50f10902f5a6b8033a0391039777187d1c700
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 22 02:31:31 2014 +0800

    added connect

commit d1bcd5b0f8c50ba9fbc01ca0730091771580166e
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 22 02:26:05 2014 +0800

    added new layout style

commit 4911c516536bad43da76e89aae844ce79455ffd7
Merge: 88144e5 1aa0b50
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Jan 21 01:31:43 2014 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 88144e55a146a04c78d6d196714ba71a99b6ff72
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Jan 21 01:29:48 2014 +0800

    用例

commit 1aa0b501b7f8c4e2f63050a5e1a0ebafae43e6ea
Merge: 1bf3461 c7c2b2a
Author: Akikonata <66875692@qq.com>
Date:   Tue Jan 21 01:28:07 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit c7c2b2a2f615f122a8239d479400ed8352bd373c
Author: campaign <zhanyi1022@gmail.com>
Date:   Tue Jan 21 01:25:26 2014 +0800

    属性深度复制

commit 1bf346148988635acaa24de57f90838dec263031
Author: Akikonata <66875692@qq.com>
Date:   Tue Jan 21 01:09:10 2014 +0800

    changed layout

commit 6acbbdf43ae0f168b88a824b5cbf9698de298458
Merge: a87ee4c 7fcb5d7
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 20 23:58:41 2014 +0800

    fixed conflict

commit a87ee4c943436bec7dd5883e02874308aeb50384
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 20 23:55:56 2014 +0800

    test

commit 7fcb5d761eb004f0d55490207ddd6180ad8c4ea3
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 20 23:53:23 2014 +0800

    添加快捷键

commit fefd5329e35070aa53dd5965cf181f2c0c94e78a
Merge: 7122ab6 b0fa6fb
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 20 23:34:32 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit 7122ab6800902dad2c6c82170b34d96fac4c66c2
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 20 23:34:15 2014 +0800

    added updateLayout

commit b0fa6fb7221d2d90b4e1ff0760fc0e6e61dfac8e
Merge: 341a9aa 6c7e0de
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 20 23:32:37 2014 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 341a9aaacfb70a2617638054f3d88cdeb43e65d9
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 20 23:32:06 2014 +0800

    修改了clone方法

commit 6c7e0de20afd06d87c67a9ad1ed95838166e3947
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 20 23:01:46 2014 +0800

    fixed layout bug

commit 1b82f700f15e8f2c4ce714c772491cef24dfc865
Merge: cddde59 866f4d7
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 20 22:53:18 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit cddde59582c60525a704c099d0e3bb990f9ad274
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 20 22:47:52 2014 +0800

    layout style switch

commit fcb507aeb85ad32b98a62af1de5f9b176577c56f
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 20 18:26:01 2014 +0800

    updated layout

commit 866f4d768634471121202c448d5a9047844efc5e
Merge: 53e8d6a e72b2f3
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 20 18:22:41 2014 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 53e8d6ab103c00ab46273070f286beec5f15d9b1
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 20 18:22:15 2014 +0800

    修改名字

commit 72c8338cf8beb90438e2255055e83d6fcba682e2
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 20 18:21:31 2014 +0800

    修改名字

commit afd2c66c8bf2965a029ef191518b95c77a073f01
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 20 18:20:55 2014 +0800

    by zhanyi

commit e72b2f30bb17b127f1bb8c7d2c897d677d2d9347
Merge: ef9ded6 ab55083
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 20 18:20:41 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit ef9ded654b2a2eb56e89a8af73ecbc4b03565bce
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 20 18:20:32 2014 +0800

    changed layout

commit ab550838503a910f4a732ba948921fdd7e5a7b55
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 20 18:20:01 2014 +0800

    修改history

commit ca60958ec906276566d89fa3a780539b6feaac2e
Merge: c4f5c21 ac91977
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 20 16:22:20 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit c4f5c210e6203307287538b4948c1a941a0efecc
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 20 16:22:02 2014 +0800

    by zhanyi

commit ac919779a896bbc03462f90422b5826714b21b7b
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 20 15:43:50 2014 +0800

    修改了layout相关的字段，样式切换的时候统一清空“layout字段”

commit a331169a01ecf8949d59dcbdbf8e7e39e55c2dde
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 20 14:30:53 2014 +0800

    修改setData和修复getCommonAncestor

commit 14fba533c6226c3b3a70159e323810f812af63c6
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 20 11:34:05 2014 +0800

    added delete and a new style

commit 7c79828033cb3568b6f33d37907009ef7103d04e
Merge: 2247985 d1bcc39
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 17 19:00:09 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit 2247985965b3bde7fc25bef627b1ac69e81a283c
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 17 19:00:06 2014 +0800

    store

commit d1bcc394029e63dad5aa36e7c1fed95f038b5100
Merge: 2622926 7c7ac88
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 17 18:58:06 2014 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 2622926a353683f556aa4da769826f5202df405f
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 17 18:54:03 2014 +0800

    by zhanyi

commit 552ab10fd53a42c83976e3def9177dbee469b809
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 17 18:53:39 2014 +0800

    添加editor

commit 7c7ac8868d4f91271b45b649b8442bac079748a0
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 17 17:52:03 2014 +0800

    added node delete

commit 707f25e075803a68ed0bf5f6eac84a4860a2b0e6
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 17 17:04:38 2014 +0800

    event.js添加preventDefault

commit fb4cc971b7fb116606ac93645a968658f0e8822c
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 17 16:45:59 2014 +0800

    添加方向键

commit 8d5c3ca6eebec4c46c509b6830fb0961982d09c9
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 17 16:28:20 2014 +0800

    getSelectNodes默认

commit 60777228b3b2bdaf51d1dfae68e7e2269eacb875
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 17 16:28:10 2014 +0800

    enterkey/tabkey

commit b7b47ab029c3ee1541a87744e87a88571d51d013
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 17 16:09:48 2014 +0800

    added layoutstyle init

commit 4cf00f52acb473f236b9109d1fa4edc01e68152e
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 17 16:08:16 2014 +0800

    added layoutstyle init

commit 7bb40a8fef121191dceddea9f7aca875c68ffa45
Merge: e4c96c3 d8902d2
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 17 15:23:57 2014 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit d8902d2c5e238f040dfcec181440e42de12c64c6
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 17 15:18:30 2014 +0800

    changed green style code

commit b89df8daab84feb19fb6207e763be56327d60d89
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 17 15:09:05 2014 +0800

    changed arrangement rule

commit 5768a7b80658105b7a3ea019073b0133eb98f514
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 17 14:35:11 2014 +0800

    changed switch style

commit e4c96c318391a22e5dc204d350f2ce92965d2bca
Merge: 0e874ed 424e8b4
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 17 14:34:31 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit 0e874edc1d57929e5333a5439b01ca25e7a10022
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 17 14:34:16 2014 +0800

    添加test case

commit 32e7742d86ff0463fe3a0a68e3dbcb1f19f7b1e5
Author: campaign <zhanyi1022@gmail.com>
Date:   Fri Jan 17 14:32:45 2014 +0800

    minder.node把svg的维护分理出去

commit 424e8b4bde9566da5bde1284de7c975bc2d78024
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 17 13:53:33 2014 +0800

    added select

commit ba2e8cfd3f14fb9fcf291eda42d3bdf036a64d51
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 17 13:24:07 2014 +0800

    added highlight

commit 63e5cf182e4d9d13c523bd79006d9135aaac825e
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 17 12:59:36 2014 +0800

    修正了select引用传错的问题

commit 94f123828cce383f6db61bec1ed2b8f42d161b05
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 17 12:36:59 2014 +0800

    重构了layout相关的内容

commit bd842160506fcd19131b892714a06b51d884110f
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Jan 15 19:47:03 2014 +0800

    修改了mindernode的在画布上添加节点的方式

commit 0f1ab1e32124f86ead0d210c1c0b42fa2cc73990
Author: yancend <dongyancen@baidu.com>
Date:   Wed Jan 15 18:52:24 2014 +0800

    [test]添加测试的index页面

commit 34298baa6b8867578fb9d4dc4677678a7f311d81
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Jan 15 17:25:27 2014 +0800

    添加getCommonAncestor/contains

commit 026e0336a15ff167ea317ee3bc18e406b840e6db
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Jan 15 15:46:46 2014 +0800

    添加了getSelectNode

commit 1af03e5a3fd70b171b04e163bbc555828f95a129
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Jan 15 15:28:12 2014 +0800

    修改了select的需求

commit fa45c9bed18f9a71ad8ba7756090548ff0554070
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Jan 15 14:45:19 2014 +0800

    去掉了debugger

commit cd402957df0aa29336f9fa7ebffd9f61f9f21600
Author: campaign <zhanyi1022@gmail.com>
Date:   Wed Jan 15 14:02:29 2014 +0800

    修改了utils.argsToArray方法

commit 70ba4153befcfbe04d72d23ee9397965a6cbb12d
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 15 11:08:07 2014 +0800

    added 2 style

commit e1a9377f85eae61d02ee95b0b20d0f0998f7dcd0
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 15 10:59:41 2014 +0800

    changed layut file

commit c9b61560f7966773acea8dfa0413fcde49ad6289
Author: Akikonata <66875692@qq.com>
Date:   Tue Jan 14 13:59:52 2014 +0800

    changed argument getting method

commit 9631b7409bad4d050bc58f47d1c2fade3e3795b0
Merge: e1c2854 679bf01
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 13 23:17:48 2014 +0800

    Merge remote-tracking branch 'origin/dev' into dev

    Conflicts:
    	src/core/minder.command.js
    	src/core/minder.module.js

commit e1c2854ae5cf02bd486ca4c98101a03028fc06e4
Author: campaign <zhanyi1022@gmail.com>
Date:   Mon Jan 13 23:16:11 2014 +0800

    修改command机制

commit 679bf01a6eb39313d2228d3236a3b493c2261003
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 13 20:22:06 2014 +0800

    added highlight

commit f965a88702ba868adbf8bdb91b0a6e2f62d7d1ad
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 13 20:08:51 2014 +0800

    dev

commit 0ea57ad4374ee4f6d793893cb7ce284138ddc5b6
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 13 20:08:31 2014 +0800

    dev

commit acb7dc6c6923f6f2f472185f4da54feff63f8862
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Jan 9 20:58:14 2014 +0800

    by zhanyi

commit b4f540a633a834e2982b26c170c1dafffa3f57b0
Merge: ee39586 89efd7b
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Jan 9 18:10:59 2014 +0800

    Merge remote-tracking branch 'origin/dev' into dev

    Conflicts:
    	demo/dev.html
    	src/core/minder.event.js
    	src/core/utils.js

commit ee395869533d71bcbb784449e303f13ad25c5fcf
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Jan 9 18:07:59 2014 +0800

    by zhanyi

commit 4d0c04b7511e6ab96f27e2f4e43ca442ed2cf9f3
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Jan 9 18:07:26 2014 +0800

    by zhanyi

commit bc07ea992279178bafed63cc5986dbec919fd35a
Author: campaign <zhanyi1022@gmail.com>
Date:   Thu Jan 9 18:07:04 2014 +0800

    添加 editor模块

commit 89efd7bb8242004653151f3b9f77b723e0393365
Author: Akikonata <66875692@qq.com>
Date:   Thu Jan 9 18:05:14 2014 +0800

    changed event modal

commit f759d12d018247a49dfc3f975313587f03e0ff8e
Author: Akikonata <66875692@qq.com>
Date:   Thu Jan 9 14:41:00 2014 +0800

    fixed updatenode bug

commit 64bd6a7c397c7424cae7cfe076c0b80f6ff750fd
Author: Akikonata <66875692@qq.com>
Date:   Thu Jan 9 14:33:45 2014 +0800

    fixed update bug

commit 4823c4c0e984117190a16fc883d33075759e8f6a
Author: Akikonata <66875692@qq.com>
Date:   Thu Jan 9 13:28:06 2014 +0800

    changed count

commit 80d3f563d3d6ced0c615afa8d84040aafbe60eab
Author: Akikonata <66875692@qq.com>
Date:   Thu Jan 9 13:23:55 2014 +0800

    added branch cut

commit 52b2c282cfa2d9f90853c892eb073a87303be694
Author: Akikonata <66875692@qq.com>
Date:   Thu Jan 9 13:20:05 2014 +0800

    changed the analyze rule

commit 9be1c43611931e99b8ebb36b7ae8017c0b2f3a41
Author: techird <techird@qq.com>
Date:   Wed Jan 8 18:01:15 2014 +0800

    touch support

commit 7b0811c064efe94eaba4c7b46e412026a6ddfcef
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 8 17:37:41 2014 +0800

    changed size

commit 67910f0b36e053511847e28d133234f9d6d248b3
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 8 17:20:32 2014 +0800

    added init

commit 0751ed0a9cf89510c83ee702e789da8e1896c5b5
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 8 16:40:02 2014 +0800

    direct

commit 44acd200ff4cf1e158cc48a1abd674e0c248eec5
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 8 16:09:35 2014 +0800

    changed delete

commit fa62f47c9d455aafa907c0b456fcaf881b4a6be0
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 8 16:04:11 2014 +0800

    changed add

commit 4debb9292659a8004f5e97e41e9f73c1434f0c36
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 8 16:01:47 2014 +0800

    changed add

commit 75a4797767da766bc36fb8eb88f3cf953da2e6fd
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 8 15:07:06 2014 +0800

    changed node default style

commit 43d9ab5297c3e2e07491eaafa2c1477156f89562
Author: techird <techird@qq.com>
Date:   Wed Jan 8 14:59:01 2014 +0800

    dev

commit 4d335a416fd8d7d9e61a12c482200477d73735a8
Author: Akikonata <66875692@qq.com>
Date:   Wed Jan 8 14:47:13 2014 +0800

    added dec fund

commit e766a3864b2a1d2d612f570d90be859d01baa70d
Author: Akikonata <66875692@qq.com>
Date:   Tue Jan 7 16:24:34 2014 +0800

    dev

commit 102f2f3c425c75e24907c7838cd48a8ea5b3ce9a
Author: techird <techird@qq.com>
Date:   Tue Jan 7 16:24:16 2014 +0800

    Draggable

commit 0b2969f80644e859a69f96ef2106db6845dbee66
Author: Akikonata <66875692@qq.com>
Date:   Tue Jan 7 14:25:33 2014 +0800

    DEV

commit 095bff41fc93550778aa20e017975d007fdd4a88
Author: Akikonata <66875692@qq.com>
Date:   Tue Jan 7 14:22:40 2014 +0800

    dev

commit 43c99b5b08a0448bcc55afd147582c42ffea7df1
Author: Akikonata <66875692@qq.com>
Date:   Tue Jan 7 12:28:54 2014 +0800

    minder graph

commit a0e1fc36e70e86c2df02a05cc1c98de604fc52c3
Author: techird <techird@qq.com>
Date:   Mon Jan 6 17:41:51 2014 +0800

    dev

commit bc465b0b156ef31fc5e48f0b8b36b75774b8ecaa
Author: techird <techird@qq.com>
Date:   Mon Jan 6 16:50:59 2014 +0800

    dev

commit ea53ce0db54c59ef52d8cee1667c30e419f48a55
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 16:17:33 2014 +0800

    added direction

commit 1cc974e23efdaab2224dda198e9b5d2741dc3d11
Merge: a93ab56 99d733d
Author: techird <techird@qq.com>
Date:   Mon Jan 6 16:12:31 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

    Conflicts:
    	src/module/keyboard.js

commit a93ab56d1b90693eb1f7ae17845461728c2da166
Author: techird <techird@qq.com>
Date:   Mon Jan 6 16:12:00 2014 +0800

    dev

commit 99d733da1b31a967155681fa359ed7e1d4a2c436
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 16:10:59 2014 +0800

    dev

commit b463a3167a9f795f58e7c35534da2527ae5fcf03
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 16:00:11 2014 +0800

    dev

commit 06a3d4c585d2be058e05d112e03be55a4d75d8f1
Author: techird <techird@qq.com>
Date:   Mon Jan 6 15:56:09 2014 +0800

    dev

commit 56423a1f3a047ce38fe55629e69207699f311f63
Author: techird <techird@qq.com>
Date:   Mon Jan 6 15:54:25 2014 +0800

    dev

commit 6ea9d9ccd6f2bc67e01e8386d43e92af5b836a10
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 15:48:16 2014 +0800

    dev

commit 7bd268cfd97e2e0664c5a76893d036eed51bf550
Author: techird <techird@qq.com>
Date:   Mon Jan 6 15:41:53 2014 +0800

    dev

commit 36320190e5f6c4872b1c95bc55fed94eb5f7f0b5
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 15:40:38 2014 +0800

    dev

commit f4336c7c852b5201a1f353d850392d7a3852c9eb
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 15:37:30 2014 +0800

    changed nodeshape

commit cf53564a3f4c1f8a2d1e39877df6617c50b61149
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 15:31:49 2014 +0800

    dev

commit f3dcb82617dd7093d9d1184e61d381a277d754f6
Author: techird <techird@qq.com>
Date:   Mon Jan 6 15:12:31 2014 +0800

    dev

commit af01ed18aebbd2fb18268304a00daf901af0071f
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 15:08:43 2014 +0800

    changed data structure

commit 4ccb9c9b58e2e90ab6de1420055898e6718d7ec6
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 14:55:11 2014 +0800

    grammar error

commit f4fde75655a877f2b79f9b1eb836879e0f37f702
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 14:52:15 2014 +0800

    changed x and y

commit 77cb339792d30a02d018e995734c63e97429e755
Author: techird <techird@qq.com>
Date:   Mon Jan 6 14:34:03 2014 +0800

    dev

commit 4db56975a23a267f8f95c341bd3ea5375d11bb14
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 14:28:34 2014 +0800

    added array support

commit 93c1993b83391d1c3ac8c0ec4f62b5df0d584ca9
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 14:22:49 2014 +0800

    deleted extra node

commit 9f299f2816d926168cc9450d0a7a7924c2a51dfe
Author: techird <techird@qq.com>
Date:   Mon Jan 6 14:22:03 2014 +0800

    dev

commit a1ae07e12ff4d07f4aa6a8a623dc00febc2ea653
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 14:21:03 2014 +0800

    dev

commit 072c26332782813647cef5804baa0867022a5b2c
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 14:01:52 2014 +0800

    dev

commit 41be91435a9983eea92a58c05343664de7ad3e77
Author: techird <techird@qq.com>
Date:   Mon Jan 6 13:59:49 2014 +0800

    dev

commit de89ff458d77e1f69ce8035c16b04ed1cc8eb72f
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 13:59:28 2014 +0800

    added string support

commit ce3a6504704f85a6b9c3e8be5d2febfaa3cf66eb
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 13:42:27 2014 +0800

    deleted console log

commit 1becb150287d0ff78d9bedb3032e2cada61e58f9
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 13:40:46 2014 +0800

    deleted console log

commit 9003d6e65b656e326c3ab9326a6f5549fe892815
Merge: 4b1bae5 3256b32
Author: techird <techird@qq.com>
Date:   Mon Jan 6 13:40:16 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

    Conflicts:
    	src/module/keyboard.js

commit 4b1bae5e5db15e91c95aede638c4d9f544d412f3
Author: techird <techird@qq.com>
Date:   Mon Jan 6 13:38:07 2014 +0800

    dev

commit 3256b32c08bfdc64a20a0130bc4bdd41aef90386
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 13:35:22 2014 +0800

    dev

commit b097be7348eec66bcf9127cbc98808d9a56fdeba
Author: Akikonata <66875692@qq.com>
Date:   Mon Jan 6 13:26:29 2014 +0800

    added highlight

commit e37d42d1e052e1c8da3ed9b8ed3997183a5bbacb
Author: techird <techird@qq.com>
Date:   Mon Jan 6 11:01:09 2014 +0800

    dev

commit 1643230b9f3b8a7241c1f091249c8d1e5497ac3f
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 3 17:55:32 2014 +0800

    dev

commit 4771513830f183069e3078b983cb39d2b5c885e7
Author: techird <techird@qq.com>
Date:   Fri Jan 3 17:20:56 2014 +0800

    dev

commit 12061327a4a68f02a89671e11ec1b5c921902323
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 3 17:20:27 2014 +0800

    dev

commit 688bbc524ba01f0f32a2502ec4af383e14a0b7e7
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 3 16:22:29 2014 +0800

    dev

commit 780aaccae4a35b1def51e68dcb37a19d5efca156
Merge: 709549f 236e6c6
Author: techird <techird@qq.com>
Date:   Fri Jan 3 16:01:53 2014 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

    Conflicts:
    	demo/dev.html
    	kity
    	src/core/minder.command.js

commit 709549f5bc3c5f07c835e33f9353d993feb1bffd
Author: techird <techird@qq.com>
Date:   Fri Jan 3 16:00:16 2014 +0800

    kity update

commit 3ea5ea8ce0bc1ed07d6e9372e42051635f43e1df
Author: techird <techird@qq.com>
Date:   Fri Jan 3 15:56:20 2014 +0800

    merge

commit 236e6c649011d4990eb482dda318ce940b65044c
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 3 15:55:36 2014 +0800

    dev

commit e3f50f9992932731bac72f17ae909d215f9c68d8
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 3 15:33:13 2014 +0800

    dev

commit 54585585cb6420f3d6090049d9f1d5cf28007c2d
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 3 14:06:02 2014 +0800

    dev

commit 3f7ded0cc093bae5f7debe766f3806507c86eaba
Author: Akikonata <66875692@qq.com>
Date:   Fri Jan 3 13:55:09 2014 +0800

    dev

commit c4682f0edbe7760002fdfc4a5dda9e9389ba26e2
Author: Akikonata <66875692@qq.com>
Date:   Thu Jan 2 15:07:07 2014 +0800

    dev

commit cc0d2ac2e3839b30b04b57ad295d76bfb18e3f7e
Author: Akikonata <66875692@qq.com>
Date:   Thu Jan 2 15:04:40 2014 +0800

    added node render

commit cf5a8805490681496ac712bd3baeede08f27cf2d
Merge: 79fc4a4 634a95b
Author: kitygraph <kitygraph@users.noreply.github.com>
Date:   Mon Dec 30 21:00:22 2013 -0800

    Merge pull request #1 from yancend/dev

    [test]添加测试框架

commit 79fc4a400724d22183362edae90e2da329c72d06
Author: techird <techird@qq.com>
Date:   Tue Dec 31 12:09:40 2013 +0800

    dev

commit 634a95b73b0983b43ae9491d740980f06724ab45
Author: yancend <dongyancen@baidu.com>
Date:   Mon Dec 30 19:45:57 2013 +0800

    [test]修改 import.php返回数据类型

commit 1d35b0dd34ac38a8ba7e78f823b04f31f510d3ac
Author: yancend <dongyancen@baidu.com>
Date:   Mon Dec 30 18:21:47 2013 +0800

    [test]添加测试框架

commit 9a63150ec1c2a9cdc350b71ed0fb7906bde1d2d1
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 24 12:37:54 2013 +0800

    dev

commit a069550fd47c32f568fc55f3ad39f54e73484a77
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 24 12:25:20 2013 +0800

    added _example define

commit 63464eb72a842229e6be74d0fdd04ee3ff4e5daf
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 24 12:23:48 2013 +0800

    changed initial into init

commit f4ec4b92126d48ddd4154acc05fea1ba76d7df3a
Merge: ef57be4 19fbe3d
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 24 12:15:12 2013 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit ef57be43b4d398db0302a341717f39bd07bfa20b
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 24 12:15:08 2013 +0800

    dev

commit 19fbe3dc5a60541edcae34a2bf1023ed41a0ed90
Merge: f793794 2c1d1e6
Author: techird <techird@qq.com>
Date:   Tue Dec 24 12:14:49 2013 +0800

    merge

commit f79379420a0adf9872038eec35894b88729ada09
Author: techird <techird@qq.com>
Date:   Tue Dec 24 12:11:28 2013 +0800

    支持重载

commit 3d8f032310f668e1a19d6a68abeec373585793e7
Author: techird <techird@qq.com>
Date:   Tue Dec 24 12:11:17 2013 +0800

    添加resetEvents方法支持

commit 26c8235072e354688ad129450042f8312c0f4077
Author: techird <techird@qq.com>
Date:   Tue Dec 24 12:10:59 2013 +0800

    命令锁逻辑修改

commit 2c1d1e6e5b204ef7f2578a34664ac96a4ee2c5ef
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 24 12:09:53 2013 +0800

    changed module

commit 2ea49a63f4857b78610bcd64e3cf4c205f319138
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 24 11:19:23 2013 +0800

    added sample code

commit e7d92d6781df3e034d92aadcc3e9432a8e4e799c
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 24 11:18:08 2013 +0800

    changed options

commit 6f39977bad85d5816670f512af3360d350104e9a
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 24 11:16:24 2013 +0800

    changed example

commit c10c774d65c6700e0ac02958d58da30ab5f77b5c
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 24 11:11:57 2013 +0800

    added destroy and reset

commit 0c512f85b418da4225ea016cfe3cf56364460087
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 24 10:51:02 2013 +0800

    changed function calling

commit e1d7962a83f0e73e1aaa406efb9e71adaa859d15
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 24 10:35:30 2013 +0800

    added ','

commit c0597de1685e75e196deecb09029140a267e75c2
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 23 18:32:02 2013 +0800

    _options

commit c54b4a66a8bed5becf7b2fa111f06d8e593c53cc
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 23 18:31:29 2013 +0800

    _options

commit 9bb0158c68bed74ec8ec0ea671477e3ced1eb084
Author: techird <techird@qq.com>
Date:   Mon Dec 23 18:30:47 2013 +0800

    option

commit 72c028c26140a07e7556c6e7f6cd3aba529dd635
Merge: 44ecd8c f3cc4c7
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 23 18:28:53 2013 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

    Conflicts:
    	demo/dev.html

commit 44ecd8c8ecfa73dcb46938749d7d883caef5ae97
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 23 18:27:32 2013 +0800

    dev

commit f3cc4c73d95f842fbd4f2d5cb7b332be52398e11
Author: techird <techird@qq.com>
Date:   Mon Dec 23 18:24:12 2013 +0800

    merge 2

commit 3cd991034daef2e66fcce69617ed7cbaf658037d
Merge: 9a66a05 3bf2700
Author: techird <techird@qq.com>
Date:   Mon Dec 23 18:01:21 2013 +0800

    merge from panzheng

commit 9a66a05c55ce2a0bbb92fdc95edeb04f5748ad93
Author: techird <techird@qq.com>
Date:   Mon Dec 23 17:54:28 2013 +0800

    update kity

commit 05069fe220ba981e960fe880f459cebc608ee67b
Author: techird <techird@qq.com>
Date:   Mon Dec 23 17:53:39 2013 +0800

    dev

commit 3bf2700ec90d835717f0173ee92f6d38b91b1af8
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 23 17:52:51 2013 +0800

    dev

commit 3cb3e8bcb36a62a234731ae4bb900e40414f62e9
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 23 17:46:08 2013 +0800

    dev

commit 94ba87d1f9690569ab99adeaeb4694b5714a1f96
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 23 16:10:27 2013 +0800

    dev

commit 360c83bf380bb1fc9b5b4d483e5d8d1673a18fc1
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 23 15:27:13 2013 +0800

    added _getCommand&&getQuery

commit 8b8945db1f2796a03b8820e6cbd03154d0aecc61
Author: techird <techird@qq.com>
Date:   Mon Dec 23 13:42:55 2013 +0800

    src adjust

commit 196addf058301516db9a268f7f850918e615a25e
Author: techird <techird@qq.com>
Date:   Mon Dec 23 13:37:57 2013 +0800

    拆分minder.js

commit 23920e313f809845de909c9c32c2484c9ceedef7
Merge: 163c528 82bfdd8
Author: techird <techird@qq.com>
Date:   Mon Dec 23 13:26:13 2013 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit 82bfdd81e26c17097defd65bdc2318feffd9e89a
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 23 13:25:18 2013 +0800

    dev

commit 163c528dc29aef23b5a983b8d093fd375e04b7b0
Author: techird <techird@qq.com>
Date:   Mon Dec 23 12:12:19 2013 +0800

    rename cancel to stopPropagation

commit 313cfc122d57f2c70de14ee721c6495775393c7c
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 23 11:35:24 2013 +0800

    dev

commit ae6c0298b6c5bdd48ff824ec86301434014aa7ba
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 23 11:16:18 2013 +0800

    dev

commit ae81c95eae27838d1e88d8db25ef0384658ecfb3
Author: Akikonata <66875692@qq.com>
Date:   Fri Dec 20 19:04:40 2013 +0800

    dev

commit 6fbd73c814d3e9264069b1ca1ab23c360dc74832
Merge: 469d530 8b7c0bf
Author: Akikonata <66875692@qq.com>
Date:   Fri Dec 20 18:23:54 2013 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

    Conflicts:
    	src/core/kityminder.js

commit 469d5306f6214518c6ebbf3f77459104431922a7
Author: Akikonata <66875692@qq.com>
Date:   Fri Dec 20 18:20:58 2013 +0800

    dev

commit 8b7c0bfa75bff33f221ebe81a0e33151b9669fbe
Author: techird <techird@qq.com>
Date:   Fri Dec 20 18:19:01 2013 +0800

    History Module

commit 0718e9b609261ab172afaa862f92a6476914b32c
Author: Akikonata <66875692@qq.com>
Date:   Fri Dec 20 15:51:04 2013 +0800

    deleted extra files

commit 901b665dd812c6dd5c6f34c69749c606b1d05d2e
Merge: cc79a59 6d54ebe
Author: Akikonata <66875692@qq.com>
Date:   Fri Dec 20 15:25:28 2013 +0800

    merge conflict

commit cc79a59d6001866027154fb8f0106d19f8244900
Author: Akikonata <66875692@qq.com>
Date:   Fri Dec 20 15:24:15 2013 +0800

    dev

commit 6d54ebe4e71c0ce608f9908818b36d6ae175f6d2
Author: techird <techird@qq.com>
Date:   Fri Dec 20 15:22:54 2013 +0800

    expose getRenderContainer()

commit 6e79243cf1f0830a83bb5a183abd76b5b25ab7a3
Merge: ad87283 599d15f
Author: techird <techird@qq.com>
Date:   Fri Dec 20 15:20:41 2013 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

    Conflicts:
    	minder_module/module.render.js

commit ad8728316cd260e18fe0445d777c8b807ed6dde6
Author: techird <techird@qq.com>
Date:   Fri Dec 20 15:19:57 2013 +0800

    Format Files

commit 65b737742daba24755ec938594bb589c147f00b6
Author: techird <techird@qq.com>
Date:   Fri Dec 20 15:19:23 2013 +0800

    Module Example

commit 8402f4c8ac0d8ecef883c007e0a11478d1cf3734
Author: techird <techird@qq.com>
Date:   Fri Dec 20 15:00:39 2013 +0800

    添加 KityMinder 到开发全局变量

commit 60ab901be6e6eff86ed893913065c57d885f4353
Author: techird <techird@qq.com>
Date:   Fri Dec 20 15:00:14 2013 +0800

    测试模块移除

commit 6f071fef41499ebf3f18750bd8d61cf8430cab44
Author: techird <techird@qq.com>
Date:   Fri Dec 20 15:00:08 2013 +0800

    模块文件建立

commit 599d15fc99cfdc6ac28e5bb4b899094f53d7c263
Author: Akikonata <66875692@qq.com>
Date:   Fri Dec 20 14:30:35 2013 +0800

    added a func

commit 4ce2e79a113bd5d565d00f726c892666b9546993
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 19:13:26 2013 +0800

    dev

commit a811bc787a00d692766dbe51611a38a74e01d3fd
Merge: 3e646f8 d0c4d01
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 19:03:09 2013 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

    Conflicts:
    	minder_module/module.default.test.js

commit 3e646f891928ae54278b0b5a71a7dd95fbdc2724
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 19:02:09 2013 +0800

    dev

commit d0c4d0139062e426d271fc5905b64ab21ec370e3
Author: techird <techird@qq.com>
Date:   Thu Dec 19 18:58:22 2013 +0800

    beautify

commit 6c1715b3d7635e0fbbf925e83b939101095d3acd
Merge: 13e44a4 5fc1721
Author: techird <techird@qq.com>
Date:   Thu Dec 19 18:57:14 2013 +0800

    solve

commit 13e44a4115416af5c694e637ea13966b0e01f6e5
Author: techird <techird@qq.com>
Date:   Thu Dec 19 18:47:18 2013 +0800

    beautify

commit 5fc1721f488dd7821b8947cec96f481ce3dfe423
Merge: a0223c7 5f4a336
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 18:46:43 2013 +0800

    merge conflict

commit a0223c7864296e094c82f9d348d991fe4fde1505
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 18:42:49 2013 +0800

    command

commit 5f4a336a40c9f7c5ef8700247f589038625a25c0
Author: techird <techird@qq.com>
Date:   Thu Dec 19 17:39:13 2013 +0800

    selection change

commit a2ba1b8f68f4bf8a8df1871d9d5bcef4362c847e
Author: techird <techird@qq.com>
Date:   Thu Dec 19 17:28:36 2013 +0800

    kity

commit eaf3afa1f6c771f2c0825c2d111e2e5bd6daaba3
Merge: 0c2f404 6cf7c31
Author: techird <techird@qq.com>
Date:   Thu Dec 19 17:21:56 2013 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit 6cf7c319a5564e5cb9cda0b0d5189a53d5a44e72
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 17:21:26 2013 +0800

    added

commit 0c2f404e3508ced24ce482c54217ea7976fe2de9
Merge: 4b354b1 6a6855a
Author: techird <techird@qq.com>
Date:   Thu Dec 19 17:18:01 2013 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit 4b354b103bb53bba05c5566b6b8bc030e853bff9
Author: techird <techird@qq.com>
Date:   Thu Dec 19 17:17:56 2013 +0800

    make private sign

commit 6a6855a26f51ee7a154efc0224f32200721d6452
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 16:58:19 2013 +0800

    changed event trigger

commit 4499d9cf01d9eb8e755d2cd904e8d23c3318b88f
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 16:51:31 2013 +0800

    changed the calling queue

commit 5343aadefdfe59cbae09d3a84df95d129777757e
Merge: 87a5329 d9a8646
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 16:19:47 2013 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit 87a532981c31d0876092e7b5aa1734fbf8332918
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 16:13:42 2013 +0800

    added closure

commit d9a864695d9b34c79df110f0d4839db86b74f1b7
Merge: 494627a 94a01e2
Author: techird <techird@qq.com>
Date:   Thu Dec 19 16:13:04 2013 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit 494627a3c223c1c705bb478afc9bf3a15559619d
Author: techird <techird@qq.com>
Date:   Thu Dec 19 16:12:56 2013 +0800

    kity update

commit 26c4353efc23f4743aa626fa00a2ae86bb7aa001
Author: techird <techird@qq.com>
Date:   Thu Dec 19 16:11:41 2013 +0800

    dev.html update

commit 4d64fed6dff53aba9d48dacedf2cbd9e8bc9245f
Author: techird <techird@qq.com>
Date:   Thu Dec 19 16:11:15 2013 +0800

    event fix

commit 94a01e2e2b7c85b74450b56b682ce04528c02ccf
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 15:53:49 2013 +0800

    added closure

commit 31f3519ae06cacb4cc634fba4486fdb4f66d06ab
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 14:42:43 2013 +0800

    added query

commit 0fd0870fa2c76bf8dbfd36d76d7c7bca8e227d90
Merge: fe36541 04bc345
Author: techird <techird@qq.com>
Date:   Thu Dec 19 14:00:27 2013 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit fe365417771c132ad92886fe220a36e8c4c7e6fa
Author: techird <techird@qq.com>
Date:   Thu Dec 19 14:00:14 2013 +0800

    merge

commit f2d230d19beb471130d1509a32ebe249b5238088
Author: techird <techird@qq.com>
Date:   Thu Dec 19 13:58:34 2013 +0800

    event & import & export

commit 04bc3453ce1a8792fe9d29c9bb6ed7c9ffbfffe9
Author: Akikonata <66875692@qq.com>
Date:   Thu Dec 19 13:12:38 2013 +0800

    fixed grammar with JSLint

commit d38e61b30b2766f7957282079a4b485ad9eb6027
Author: techird <techird@qq.com>
Date:   Wed Dec 18 17:57:57 2013 +0800

    revert kity

commit 9a703d2053bd208e990c28fb1578b1fc577416ab
Merge: 8569f75 8723038
Author: techird <techird@qq.com>
Date:   Wed Dec 18 17:56:16 2013 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit 8569f75abf719fc8545149e9083a2e7906c17f56
Author: techird <techird@qq.com>
Date:   Wed Dec 18 17:55:09 2013 +0800

    revert kity

commit 87230381ee7e97205f9bab85e400a39d8e710c5c
Author: Akikonata <66875692@qq.com>
Date:   Wed Dec 18 17:51:33 2013 +0800

    added queryState

commit 917d130604b1b433deb154a143f6af11ca371c7f
Merge: 208a7cd 6b548ab
Author: Akikonata <66875692@qq.com>
Date:   Wed Dec 18 17:29:39 2013 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit 208a7cd05d4783aaaf376275b050c9cad56b8412
Author: Akikonata <66875692@qq.com>
Date:   Wed Dec 18 17:29:20 2013 +0800

    added action stack

commit 89760d300a6181113915f183dacf04a0351ed302
Author: techird <techird@qq.com>
Date:   Wed Dec 18 16:04:29 2013 +0800

    kity

commit dda791d202caa72c251713d93abe71c76c545c07
Author: techird <techird@qq.com>
Date:   Wed Dec 18 16:01:07 2013 +0800

    remove symbol link

commit 6b548ab37807eb4b8fdb8164dd55fe5f575c3451
Merge: 4b821dc a2631cf
Author: techird <techird@qq.com>
Date:   Wed Dec 18 15:58:46 2013 +0800

    merge

commit 4b821dcd3d8af18c2c4b2bfabc39c97318c6aefa
Author: techird <techird@qq.com>
Date:   Wed Dec 18 15:57:37 2013 +0800

    dev

commit e5ffeea92e85c04576eff99a051e5b200b6c0c35
Author: techird <techird@qq.com>
Date:   Wed Dec 18 15:54:58 2013 +0800

    link kity

commit a2631cfa7239e43c54447092675926bcf722d838
Merge: 75836c5 fbde29d
Author: Akikonata <66875692@qq.com>
Date:   Wed Dec 18 15:27:58 2013 +0800

    Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

commit 75836c57e667fda3b6dd37a1cba96735b95e7d69
Author: Akikonata <66875692@qq.com>
Date:   Wed Dec 18 15:27:50 2013 +0800

    added impliment of  _initModules

commit fbde29d709e2989c550cf5ecfaf30de53d5992ed
Author: techird <techird@qq.com>
Date:   Wed Dec 18 15:25:38 2013 +0800

    测试文件

commit 5e4cdcae4013031786723051ede77dc722f7de4a
Author: techird <techird@qq.com>
Date:   Wed Dec 18 15:25:29 2013 +0800

    MinderNode

commit 4fb1161e55bcbc76df9772717a4d3b6d2b81e1da
Author: techird <techird@qq.com>
Date:   Wed Dec 18 15:24:55 2013 +0800

    dev版本引用脚本

commit 3b0ce8c16634be24278db1ff47c1b0d53bb2573d
Author: techird <techird@qq.com>
Date:   Wed Dec 18 15:24:42 2013 +0800

    Node build工具

commit 6723effaa4a23d6741981f46879d37a8512ba7d2
Author: techird <techird@qq.com>
Date:   Wed Dec 18 15:24:33 2013 +0800

    忽略项目文件

commit a26755efe2123888e193c3f759aed839a5a15286
Author: techird <techird@qq.com>
Date:   Wed Dec 18 15:23:40 2013 +0800

    .jshintrc

commit baa4e3e1b45f67f7e89eb2e5ff22bfe46ba095d0
Author: techird <techird@qq.com>
Date:   Tue Dec 17 18:14:39 2013 +0800

    core framework

commit 3d789914f3592bc9293ddbb2737250b5b1f2430b
Merge: d548c9b a6b69e8
Author: techird <techird@qq.com>
Date:   Tue Dec 17 14:54:20 2013 +0800

    架构修改合并

commit d548c9ba69a5352dea8301854c00ed5e76e709d2
Author: techird <techird@qq.com>
Date:   Tue Dec 17 14:09:04 2013 +0800

    架构设计修改

commit a6b69e8a2d683c8a4c39c1a3d254d50de03a88ef
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 17 14:07:27 2013 +0800

    added document

commit 416cac7735405382d7236b559f7603091c222096
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 17 13:08:30 2013 +0800

    format

commit ca44d2ceac2708550d3db8622cac8c9134558bdd
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 17 13:02:12 2013 +0800

    changed command doc

commit 5f3051b9d03cec5b10811c0f2cbe0455d7c5fa07
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 17 12:59:20 2013 +0800

    changed command doc

commit cf1f38707a6790a584edb6e26e719f8561e72941
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 17 12:54:17 2013 +0800

    added command define

commit 5432fbe3bd4df011e55dcb0831193c4fde04e50f
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 17 12:40:29 2013 +0800

    changed module define

commit bc05310e5648010a68f1a89c9df6d1e7bf435554
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 17 12:35:42 2013 +0800

    changed module define

commit 08cee6c9143c1416cd54a7b5ab4796938d9aa121
Author: Akikonata <66875692@qq.com>
Date:   Tue Dec 17 11:11:49 2013 +0800

    changed module define

commit d7b40a5b3c9121480a246e637c84e42542faa0a4
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 16 18:59:27 2013 +0800

    changed km Architecture document

commit f285107d06fc889174cc8f856abd020badb5a8bb
Author: Akikonata <66875692@qq.com>
Date:   Mon Dec 16 18:30:32 2013 +0800

    changed km Architecture document

commit b63fe9ad4426ae94dc7d409b740bcd5ecb69a8bf
Author: techird <techird@qq.com>
Date:   Mon Dec 16 15:53:53 2013 +0800

    添加目标

commit 7eb09c537639cd409d90b893310108cf3ef47d8d
Author: techird <techird@qq.com>
Date:   Mon Dec 16 15:37:38 2013 +0800

    架构脑图

commit 442025c88b48b53c4b4c9c18a0a3ab90ab48702c
Author: techird <techird@qq.com>
Date:   Mon Dec 16 15:12:31 2013 +0800

    脑图设计文档更新

commit 11d9f26c0cfa55d075123ad0a42fce733715427c
Author: techird <techird@qq.com>
Date:   Mon Dec 16 15:12:22 2013 +0800

    更新Kity子库引用

commit 4c679ea257624d427c0a5d0e2e7c63970f57a942
Author: techird <techird@qq.com>
Date:   Mon Dec 16 12:55:34 2013 +0800

    架构文档
Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev