Commit Graph

354 Commits

Author SHA1 Message Date
msincenselee
86cdf2a06b 与vnpy/Dev合并部分内容 2016-07-25 08:13:26 +08:00
msincenselee
7786dcda27 修改gateway,增加log记录 2016-07-13 23:43:16 +08:00
msincenselee
2075fe9866 取消不使用的交易接口 2016-07-13 23:42:05 +08:00
msincenselee
4e9026be8b 取消其他不使用的交易接口 2016-07-13 23:40:59 +08:00
msincenselee
b74e81f1c0 委托表格已有双击撤单功能,取消交易窗口的撤单功能 2016-07-13 23:40:28 +08:00
msincenselee
bd63f7e04d 修改风控参数,修改策略,修改gateway,增加log记录 2016-07-04 23:39:56 +08:00
msincenselee
99fd9d5427 add ignore files 2016-07-04 01:04:18 +08:00
msincenselee
41fd656386 增加Log本地日志 2016-07-04 00:59:48 +08:00
msincenselee
9c43f0097f 合并版本前初始化vnpy 2016-07-02 11:12:56 +08:00
msincenselee
6e31097276 Merge remote-tracking branch 'remotes/origin/master' into vnpy/master
Conflicts:
	.gitignore
2016-07-02 11:00:05 +08:00
msincenselee
44046e3a12 commit before merge
commit before merge
2016-07-02 10:20:07 +08:00
msincenselee
2349499747 Merge remote-tracking branch 'remotes/origin/master' into vnpy/master
Conflicts:
	.gitignore
2016-07-02 10:16:51 +08:00
msincenselee
df17715566 nothing 2016-02-14 13:46:56 +08:00
msincenselee
e0a50e5a29 private log 2016-02-14 13:08:03 +08:00
msincenselee
b845966b2a recent update 2016-02-14 13:03:41 +08:00
msincenselee
843814bd83 ignore old files 2015-12-15 16:28:52 +08:00
msincenselee
eac3bda7a3 更新dll,适合windows server 2015-12-15 16:26:42 +08:00
msincenselee
2e6d994a5d 实盘修改 2015-12-09 23:42:17 +08:00
msincenselee
64f772e650 Merge remote-tracking branch 'refs/remotes/vnpy/master'
Conflicts:
	vn.trader/ContractData.vt
	vn.trader/ctaEngine.py
	vn.trader/ctaStrategies.py
	vn.trader/ltsGateway.py
	vn.trader/uiBasicWidget.py
	vn.trader/uiMainWindow.py
	vn.trader/vtConstant.py
	vn.trader/vtEngine.py
2015-11-20 15:50:57 +08:00
msincenselee
4cbc660b62 add comment 2015-11-20 15:26:15 +08:00
WOLF
e019a2bb35 修复CtaEngine的sendOrder的bug 2015-11-20 15:25:58 +08:00
WOLF
241808b45b 修复之前版本里的一些bug,并完成CTA用数据记录工具(tick和分钟线) 2015-11-20 14:11:29 +08:00
msincenselee
bdd35fb9d5 comment vnpy 2015-11-15 15:53:54 +08:00
msincenselee
a69e8836d0 merge 2015-11-14 21:41:48 +08:00
msincenselee
3f082b40f7 merge 2 2015-11-13 15:59:25 +08:00
msincenselee
a1050d84f6 merge 2015-11-13 11:39:26 +08:00
msincenselee
d7c225e9fe mysql_connect 2015-11-09 22:13:13 +08:00
msincenselee
01d9f9e876 merge 2015-11-09 21:25:32 +08:00
msincenselee
d009a5deb5 20151105 2015-11-05 00:40:18 +08:00
msincenselee
91d9d32a5c 20151105 2015-11-05 00:37:09 +08:00
msincenselee
09646b6158 Merge remote-tracking branch 'refs/remotes/vnpy/master' 2015-11-05 00:32:47 +08:00
msincenselee
f28351a242 20151105 2015-11-05 00:28:41 +08:00
msincenselee
43f96b1e05 201501105 2015-11-05 00:28:12 +08:00
vn.py
7d147515d6 Merge pull request #14 from bigtan/patch-1
Update eventEngine.py
2015-11-01 09:45:17 +08:00
msincenselee
20e18eefa3 fix amount bug 2015-10-28 10:15:41 +08:00
msincenselee
a6066b05f4 history days 2015-10-25 21:26:37 +08:00
msincenselee
cbf320dc39 data issue 2015-10-25 00:56:43 +08:00
Bigtan
61e089f27c Update eventEngine.py
fix a minor bug
2015-10-24 23:33:32 +08:00
msincenselee
83e50ac220 Merge remote-tracking branch 'refs/remotes/vnpy/master'
Conflicts:
	.gitignore
	vn.trader/CTP_connect.json
	vn.trader/ContractData.vt
	vn.trader/LTS_connect.json
	vn.trader/ctaEngine.py
	vn.trader/ctaStrategies.py
	vn.trader/ctaStrategyTemplate.py
	vn.trader/ctpGateway.py
	vn.trader/ltsGateway.py
	vn.trader/uiBasicWidget.py
	vn.trader/uiCtaWidget.py
	vn.trader/uiMainWindow.py
	vn.trader/vtConstant.py
	vn.trader/vtEngine.py
	vn.trader/vtGateway.py
2015-10-24 08:40:05 +08:00
msincenselee
389fa9b4f8 comment 2015-10-24 08:37:39 +08:00
msincenselee
decec65092 daily 2015-10-24 08:01:02 +08:00
msincenselee
ab4ef8ff1f path 2015-10-24 07:25:53 +08:00
msincenselee
3a77d39b9b ignore pickle file 2015-10-24 06:59:08 +08:00
msincenselee
1324e5ab2d local cache 2015-10-24 01:12:08 +08:00
msincenselee
e48ba99820 daily update 2015-10-22 10:40:59 +08:00
msincenselee
e5158b096b save demostrategy data in backtesting 2015-10-20 22:54:57 +08:00
msincenselee
94399f2250 save demostrategy data in backtesting 2015-10-20 22:50:56 +08:00
msincenselee
7b550fd788 delete 2015-10-19 17:15:36 +08:00
msincenselee
203ea2a803 delete 2015-10-19 17:14:40 +08:00
msincenselee
676c4c6d40 Merge remote-tracking branch 'refs/remotes/vnpy/master'
Conflicts:
	.gitignore
	vn.trader/CTP_connect.json
	vn.trader/ContractData.vt
	vn.trader/LTS_connect.json
	vn.trader/ctaEngine.py
	vn.trader/ctaStrategies.py
	vn.trader/ctaStrategyTemplate.py
	vn.trader/ctpGateway.py
	vn.trader/ltsGateway.py
	vn.trader/uiBasicWidget.py
	vn.trader/uiCtaWidget.py
	vn.trader/uiMainWindow.py
	vn.trader/vtConstant.py
	vn.trader/vtEngine.py
	vn.trader/vtGateway.py
2015-10-19 17:05:00 +08:00