Commit Graph

17 Commits

Author SHA1 Message Date
msincenselee
2e6d994a5d 实盘修改 2015-12-09 23:42:17 +08:00
msincenselee
4cbc660b62 add comment 2015-11-20 15:26:15 +08:00
msincenselee
bdd35fb9d5 comment vnpy 2015-11-15 15:53:54 +08:00
msincenselee
3f082b40f7 merge 2 2015-11-13 15:59:25 +08:00
msincenselee
43f96b1e05 201501105 2015-11-05 00:28:12 +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
3a77d39b9b ignore pickle file 2015-10-24 06:59:08 +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
WOLF
29e518d07e Merge branch 'master' of https://github.com/vnpy/vnpy
Conflicts:
	.gitignore
2015-10-16 16:52:26 +08:00
WOLF
c3cf86c452 初步完成了vn.trader,包含CTP、LTS、WIND的接口,以及CTA策略模块,策略模块的测试尚未全部完成 2015-10-16 16:50:44 +08:00
golden
5cc755184d update .gitignore 2015-10-13 16:41:55 +08:00
msincenselee
aa489ea31b mysql 2015-10-08 00:27:06 +08:00
WOLF
88b9e5247d 添加部分忽略 2015-09-09 09:24:43 +08:00
WOLF
6e4aa7eb8c 修复部分vn.strategy的bug 2015-05-28 10:09:59 +08:00
WOLF
e851cf8a76 LTSDEMO加入了登录时,行情和交易使用不同密码的功能 2015-05-11 09:34:26 +08:00
WOLF
bf874016cb 将vn.lts的td api中部分原本手工修改的代码改为自动生成,用于防止空指针的问题 2015-03-26 15:47:39 +08:00
WOLF
a9ff04a808 初步完成了LTS API的行情MD和交易TD封装,以及MD的测试脚本,LTS API版本20150115 2015-03-02 13:05:53 +08:00