vn.py
|
aaa7a042b5
|
Merge pull request #259 from vnpy/revert-253-master
Revert "在行情订阅中，增加了编辑订阅合约的功能"
|
2017-03-10 23:12:18 +08:00 |
|
vn.py
|
0bc2256561
|
Revert "在行情订阅中，增加了编辑订阅合约的功能"
|
2017-03-10 23:10:50 +08:00 |
|
vn.py
|
f2dba02243
|
Merge pull request #253 from ares89/master
在行情订阅中，增加了编辑订阅合约的功能
|
2017-03-08 22:50:08 +08:00 |
|
chenxy123
|
21ce611ccd
|
增加持仓盈亏字段
|
2017-03-08 22:34:17 +08:00 |
|
chenxy123
|
cbcf781d20
|
修改风控模块关于撤单统计部分代码
|
2017-03-08 22:27:08 +08:00 |
|
vn.py
|
7f2c47f425
|
Merge pull request #252 from ares89/dev
风控模块增加单品种报撤单次数限制
|
2017-03-08 16:54:55 +08:00 |
|
chenxy123
|
defec19912
|
修复TargetPosTemplate的bug
|
2017-03-07 22:34:21 +08:00 |
|
sunlit@home
|
246dc4cba0
|
风控模块增加单品种报撤单次数限制
|
2017-03-07 22:22:21 +08:00 |
|
vn.py
|
70151b0f16
|
Merge pull request #249 from zhnlks/dev
fix typo
|
2017-03-07 16:17:49 +08:00 |
|
zhnlk
|
0377f07d37
|
fix typo
|
2017-03-07 15:47:57 +08:00 |
|
chenxy123
|
45f8cb21e6
|
修复typo
|
2017-03-06 23:02:52 +08:00 |
|
chenxy123
|
85f31e7423
|
增加King Keltner策略
|
2017-03-06 22:07:24 +08:00 |
|
chenxy123
|
6b8ae72c9b
|
增加目标持仓交易策略模板，感谢量衍投资
|
2017-03-05 15:51:28 +08:00 |
|
vn.py
|
3784c78140
|
Merge pull request #237 from oldwain/dev
fix ClientEngine.dbQuery without return
|
2017-02-28 11:22:55 +08:00 |
|
oldwain
|
ca6a568564
|
Merge branch 'dev' of https://github.com/vnpy/vnpy into dev
|
2017-02-27 22:04:10 +08:00 |
|
chenxy123
|
06d4cc129f
|
Merge branch 'dev' of https://github.com/vnpy/vnpy
|
2017-02-27 21:18:47 +08:00 |
|
chenxy123
|
ee5159a000
|
修复vtServer无法找到路径的bug
|
2017-02-27 21:17:24 +08:00 |
|
oldwain
|
b358bd3564
|
fix ClientEngine.dbQuery without return
|
2017-02-27 16:14:46 +08:00 |
|
vn.py
|
2173f3ae92
|
Merge pull request #236 from victorzsl/dev
Bug fix in ctaBacktesting.py
thansks!
|
2017-02-27 09:36:45 +08:00 |
|
chenxy123
|
8b253d0f0b
|
增加vn.trader的链行接口
|
2017-02-25 02:05:06 +08:00 |
|
victorzsl
|
3fabada158
|
Bug Fix
ctaDemo->strategy.strategyEmaDemo
|
2017-02-24 22:42:01 +08:00 |
|
victorzsl
|
bcca5e4d60
|
Merge remote-tracking branch 'refs/remotes/vnpy/dev' into dev
|
2017-02-24 13:25:42 +08:00 |
|
vn.py
|
926d093924
|
Merge pull request #216 from tesla1060/master
增加CTP接口的认证功能，支持部分需要程序化备案的期货公司。
非常感谢！
|
2017-02-20 09:25:03 +08:00 |
|
vn.py
|
f437a0413f
|
Merge pull request #229 from sunnycomes/master
方法名写错了，已改qryAccont->qryAccount
|
2017-02-20 09:22:38 +08:00 |
|
cjsun
|
4896c2ff89
|
qryAccont->qryAccount
|
2017-02-18 14:51:57 +08:00 |
|
chenxy123
|
e2ae294a39
|
完成火币的Gateaway接入
|
2017-02-18 00:14:52 +08:00 |
|
vn.py
|
796c529992
|
Merge pull request #226 from sunnycomes/master
解决返回变量个数不匹配的问题
|
2017-02-17 09:27:38 +08:00 |
|
cjsun
|
890bd0bf6b
|
fix bug
|
2017-02-16 15:12:34 +08:00 |
|
chenxy123
|
9ee15faae1
|
Merge branch 'dev' of https://github.com/vnpy/vnpy
|
2017-02-14 22:55:16 +08:00 |
|
chenxy123
|
b0257be5e6
|
增加链行接口vn.lhang
|
2017-02-14 22:54:53 +08:00 |
|
vn.py
|
6fc287c6e9
|
Merge pull request #225 from rrrrrr8/dev
fix typo in vtEngine.py
|
2017-02-13 14:08:36 +08:00 |
|
recotra
|
95a4d10b99
|
Update vtEngine.py
|
2017-02-13 10:17:10 +08:00 |
|
recotra
|
1c49d1e1b7
|
Merge pull request #1 from vnpy/dev
merge upstream dev
|
2017-02-13 10:09:42 +08:00 |
|
vn.py
|
ed7aeeca7a
|
Merge pull request #224 from AaronGuan/dev
增加通过tushare下载沪深股票日行情
|
2017-02-13 09:15:38 +08:00 |
|
Aaron.G
|
7f823cab9f
|
tussore下载沪深股票日行情
增加tushare下载沪深股票日行情插入MongoDB。
|
2017-02-12 22:47:26 +08:00 |
|
sunlit@home
|
8bf7692267
|
优化显示
|
2017-02-12 19:38:03 +08:00 |
|
chenxy123
|
58c0a0217f
|
Merge branch 'dev' of https://github.com/vnpy/vnpy
|
2017-02-12 11:14:46 +08:00 |
|
chenxy123
|
001d428eb6
|
修改CTA策略模块，实现策略的动态加载
|
2017-02-12 11:14:27 +08:00 |
|
ares89@wind
|
819d54e5d7
|
优化操作逻辑
|
2017-02-10 13:47:32 +08:00 |
|
ares89@wind
|
cd47994617
|
优化操作逻辑
|
2017-02-10 10:19:39 +08:00 |
|
ares89@wind
|
2605103b9f
|
优化复选框的显示
|
2017-02-09 19:31:14 +08:00 |
|
ares89@wind
|
1e2799933f
|
优化复选框的显示
|
2017-02-09 16:33:33 +08:00 |
|
vn.py
|
0a449df678
|
Merge pull request #218 from AaronGuan/dev
新增通达信分钟数据载入MongoDB
|
2017-02-09 09:45:09 +08:00 |
|
AaronGuan
|
60b14a3403
|
新增通达信分钟数据载入MongoDB
通达信的历史数据导出功能可免费获取股票、期货的历史分钟数据，这里提供将导出的历史分钟数据插入MongoDB的函数
|
2017-02-09 00:17:45 +08:00 |
|
sunlit@home
|
359504b16c
|
增加了订阅合约编辑
|
2017-02-08 23:05:33 +08:00 |
|
ares89@wind
|
2ee300ad2b
|
优化显示
|
2017-02-08 17:55:38 +08:00 |
|
ares89@wind
|
4e49f06246
|
优化显示
|
2017-02-08 15:40:28 +08:00 |
|
ares89@wind
|
e5ce000a7d
|
界面
|
2017-02-08 11:41:28 +08:00 |
|
ares89@wind
|
659c43fee1
|
增加列
|
2017-02-07 19:32:55 +08:00 |
|
san jose
|
518b7f1403
|
add authentication for ctpGateway.
|
2017-02-07 16:43:54 +08:00 |
|