Commit Graph

4933 Commits

Author SHA1 Message Date
Yanyan-Wang
fe699f87d7 fix conflict 2018-07-13 16:40:31 +08:00
shiwu
47d6a90762 fix conflict 2018-07-13 16:40:31 +08:00
Yanyan-Wang
149cfb08b6 save 2018-07-13 16:27:12 +08:00
shiwu
f3f39fcf08 save 2018-07-13 16:27:12 +08:00
huangtong.ht
df1493312a publish 2.0.4 2018-07-12 21:41:28 +08:00
huangtong.ht
7198aed2f3 publish 2.0.4 2018-07-12 21:41:28 +08:00
huangtong.ht
a111948668 Release 2.0.4 2018-07-12 21:38:24 +08:00
huangtong.ht
80d1e3296f Release 2.0.4 2018-07-12 21:38:24 +08:00
huangtong.ht
163c77d498 Merge branch 'master' of https://github.com/antvis/g6 2018-07-12 09:58:42 +08:00
huangtong.ht
0771819ac2 Merge branch 'master' of https://github.com/antvis/g6 2018-07-12 09:58:42 +08:00
Yellowthrough
2d1b44cea3 Merge pull request #365 from antvis/plugin.tool.tooltip
Plugin.tool.tooltip
2018-07-12 09:54:00 +08:00
Yellowthrough
d05608c5fb Merge pull request #365 from antvis/plugin.tool.tooltip
Plugin.tool.tooltip
2018-07-12 09:54:00 +08:00
huangtong.ht
59d300af3f correct test 2018-07-11 21:10:08 +08:00
huangtong.ht
4c5c309fa8 correct test 2018-07-11 21:10:08 +08:00
huangtong.ht
c5e87183d1 correct tooltip test 2018-07-11 21:08:43 +08:00
huangtong.ht
581db562a3 correct tooltip test 2018-07-11 21:08:43 +08:00
huangtong.ht
5877b0f784 fix conflict 2018-07-11 20:44:49 +08:00
huangtong.ht
2fb6f46800 fix conflict 2018-07-11 20:44:49 +08:00
huangtong.ht
c5913e97e9 remove css 2018-07-11 20:35:52 +08:00
huangtong.ht
f53352f0ab remove css 2018-07-11 20:35:52 +08:00
huangtong.ht
8da8fbbd61 Merge branch 'master' of https://github.com/antvis/g6 2018-07-11 20:04:49 +08:00
huangtong.ht
f34e8e77bc Merge branch 'master' of https://github.com/antvis/g6 2018-07-11 20:04:49 +08:00
huangtong.ht
2e626c4ff8 feat(plugin): add tool.tooltip. Closes #360. 2018-07-11 20:01:34 +08:00
huangtong.ht
d036f1e0df feat(plugin): add tool.tooltip. Closes #360. 2018-07-11 20:01:34 +08:00
Yellowthrough
6a6a65daa4 Merge pull request #358 from antvis/FF
Add the Force Atlas 2 layout algorithm with its settings.
2018-07-10 16:46:48 +08:00
Yellowthrough
4c5817585f Merge pull request #358 from antvis/FF
Add the Force Atlas 2 layout algorithm with its settings.
2018-07-10 16:46:48 +08:00
Yanyan-Wang
e464509306 style: change the calling way of forceAtlas2 on template.maxSpanningForest 2018-07-10 15:56:13 +08:00
shiwu
8df4a94571 style: change the calling way of forceAtlas2 on template.maxSpanningForest 2018-07-10 15:56:13 +08:00
Yanyan-Wang
3ee1da4b81 fix: remove the forceAtlas.js in template.maxSpanningForest, use forceAtlas from layout.forceAtlas2 2018-07-10 15:16:54 +08:00
shiwu
a6be517730 fix: remove the forceAtlas.js in template.maxSpanningForest, use forceAtlas from layout.forceAtlas2 2018-07-10 15:16:54 +08:00
Yanyan-Wang
a723ba55b5 fix: add demos: plugin-fisheye, plugin-forceAtlas2, gallery-graphanalyzer 2018-07-10 15:03:49 +08:00
shiwu
f2d6de79f8 fix: add demos: plugin-fisheye, plugin-forceAtlas2, gallery-graphanalyzer 2018-07-10 15:03:49 +08:00
Yanyan-Wang
2354510419 fix: add demos: plugin-forceAtlas2, plugin-fisheye 2018-07-10 14:59:24 +08:00
shiwu
86ed9c5513 fix: add demos: plugin-forceAtlas2, plugin-fisheye 2018-07-10 14:59:24 +08:00
Yellowthrough
7b796aaa95 Merge pull request #359 from BlackGanglion/fix/comment
fix(query): fix code comment
2018-07-10 14:21:43 +08:00
Yellowthrough
0cf41c22bf Merge pull request #359 from BlackGanglion/fix/comment
fix(query): fix code comment
2018-07-10 14:21:43 +08:00
huangtong.ht
2250e2b7dc Merge branch 'FF' of https://github.com/antvis/g6 into FF 2018-07-10 14:08:21 +08:00
huangtong.ht
1d9559b3da Merge branch 'FF' of https://github.com/antvis/g6 into FF 2018-07-10 14:08:21 +08:00
huangtong.ht
792241f0b1 update .travis.yml 2018-07-10 14:06:59 +08:00
huangtong.ht
5549301d29 update .travis.yml 2018-07-10 14:06:59 +08:00
Yanyan-Wang
87f9d89c19 style: remove console.log 2018-07-10 14:05:40 +08:00
shiwu
9db809eb13 style: remove console.log 2018-07-10 14:05:40 +08:00
BlackGanglion
dd343055cc fix(query): fix code comment 2018-07-10 13:54:38 +08:00
BlackGanglion
d85a1c24f0 fix(query): fix code comment 2018-07-10 13:54:38 +08:00
huangtong.ht
ab5a525585 publish 2.0.4-beta.4 2018-07-10 11:55:17 +08:00
huangtong.ht
70c2c4bd2e publish 2.0.4-beta.4 2018-07-10 11:55:17 +08:00
Yanyan-Wang
52593645fa Merge branch 'toSvg' into FF 2018-07-10 11:11:10 +08:00
shiwu
0c5ad0d4d4 Merge branch 'toSvg' into FF 2018-07-10 11:11:10 +08:00
Yanyan-Wang
dfe4d48974 feat: forceAtlas2 && fisheye 2018-07-10 11:08:57 +08:00
shiwu
acb1f96505 feat: forceAtlas2 && fisheye 2018-07-10 11:08:57 +08:00