chenxy123
|
e80702042f
|
Merge branch 'dev' of https://github.com/vnpy/vnpy
|
2017-04-07 21:46:35 +08:00 |
|
chenxy123
|
d8df4db277
|
修复typo
|
2017-04-07 21:46:14 +08:00 |
|
hackerwei
|
f12445f88b
|
typo & error in kk strategy
|
2017-04-07 20:30:44 +08:00 |
|
vn.py
|
9cb4274ee4
|
Merge pull request #276 from hackerwei/dev
typo
|
2017-04-07 09:34:25 +08:00 |
|
hackerwei
|
05212ea91e
|
typo
|
2017-04-07 00:12:16 +08:00 |
|
chenxy123
|
0694738fe2
|
1. 增加CTA模块退出时保存持仓的询问
2. 增加DualThrust策略
|
2017-04-04 20:17:38 +08:00 |
|
chenxy123
|
1b7f15f459
|
修复CTP接口认证部分的bug
|
2017-04-02 22:26:36 +08:00 |
|
chenxy123
|
5b6a4a88ae
|
增加CTA引擎和回测引擎中发送委托时对合约最小价格变动的取整
|
2017-03-27 06:49:28 +08:00 |
|
chenxy123
|
f2e15cba65
|
完成CTA策略模块的翻译
|
2017-03-20 22:51:43 +08:00 |
|
chenxy123
|
814ddb593d
|
增加KK策略的移动止损出场功能，更新附带的股指数据到最新
|
2017-03-20 22:23:41 +08:00 |
|
chenxy123
|
416e27f1f7
|
增加风控模块和行情记录模块的英文翻译
|
2017-03-19 23:10:34 +08:00 |
|
chenxy123
|
86056f46f6
|
增加主界面上的英文支持
|
2017-03-19 16:10:05 +08:00 |
|
vn.py
|
ea855b4f22
|
Merge pull request #266 from vnpy/dev
v1.5.1
|
2017-03-19 14:45:18 +08:00 |
|
chenxy123
|
f3e6a1c02c
|
CTA引擎中增加对重复成交推送的过滤
|
2017-03-18 12:22:49 +08:00 |
|
chenxy123
|
9f6ea1fd5c
|
1. ctaAlgo模块改名ctaStrategy
2. 将vn.trader下的所有接口统一放到了一个单独的gateway文件夹中，并实现自动识别和加载
|
2017-03-18 12:19:51 +08:00 |
|
chenxy123
|
0edbb3c934
|
将API封装相关的模块放到一个独立的vn.api模块下
|
2017-03-16 22:53:48 +08:00 |
|
chenxy123
|
531818ac5f
|
增加合约查询组件的过滤功能
|
2017-03-15 23:33:52 +08:00 |
|
vn.py
|
c7049a4ae9
|
Merge pull request #261 from vnpy/beta
Beta
|
2017-03-11 22:33:01 +08:00 |
|
vn.py
|
e5372af3d0
|
Merge pull request #260 from vnpy/dev
Dev
|
2017-03-10 23:27:50 +08:00 |
|
chenxy123
|
1517117b8e
|
在CTP接口层添加对无效数据的过滤
|
2017-03-10 23:24:24 +08:00 |
|
vn.py
|
65b8551677
|
Merge pull request #258 from bigtan/dev
增加Python3封装，放置在单独的vn.ctp/py3文件夹下
|
2017-03-10 23:14:09 +08:00 |
|
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 |
|
bigtan
|
731a5d9fb1
|
增加Python3封装
|
2017-03-10 21:17:25 +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 |
|