Commit Graph

2460 Commits

Author SHA1 Message Date
vn.py
f1b85f5634
Merge branch 'dev' into tora 2019-06-26 21:45:28 +08:00
vn.py
d0bb68fc47 [Mod] complete test of ToraGateway 2019-06-26 21:43:06 +08:00
vn.py
f2c5882e03
Merge pull request #1862 from vnpy/alpaca
Alpaca
2019-06-25 19:42:33 +08:00
vn.py
a9ed153f60
Merge pull request #1861 from nanoric/tora
[Add] ToraGateway
2019-06-25 19:39:26 +08:00
nanoric
e22cb9a415 [Add] ToraGateway: TODO list 2019-06-25 16:58:16 +08:00
nanoric
bc47ef7ea4 Merge remote-tracking branch 'remotes/origin/dev' into tora 2019-06-25 16:41:15 +08:00
nanoric
92092c127c [Mod] ToraGateway: Finished & Remove Useless Code 2019-06-25 16:39:29 +08:00
vn.py
a25051087d [Mod] complete test of AlpacaGateway 2019-06-25 16:25:34 +08:00
nanoric
213e35c690 [Add] ToraGateway: cancel_order 2019-06-25 15:29:16 +08:00
nanoric
69bb4bc685 Merge remote-tracking branch 'remotes/nanoric/tora' into tora
# Conflicts:
#	vnpy/gateway/tora/td.py
2019-06-25 15:00:30 +08:00
nanoric
ef49763381 [Add] tora_td: print detail about OnErrRtnOrderInsert,
[Add] tora_td: ignore non-number OrderRef
2019-06-25 14:58:57 +08:00
vn.py
1b139f34a1 [Mod] improve code readability 2019-06-25 10:47:27 +08:00
vn.py
af94e1e186 [Del] remove unnecessary try...catch 2019-06-25 10:37:40 +08:00
vn.py
0d1a536b23
Merge pull request #1858 from vigarbuaa/master
[add] add alpaca gateway to vnpy
2019-06-25 10:31:02 +08:00
vn.py
72b28df57b
Merge pull request #1846 from 1122455801/rest_compatible_json_headers
[Add] rest_client的data参数增加其他格式支持
2019-06-25 10:28:15 +08:00
vn.py
6659719e2d [Add]mainwindow toolbar for apps 2019-06-24 13:29:22 +08:00
vn.py
7682749bba [Fix] bug when close TapGateway 2019-06-22 23:34:53 +08:00
vigarbuaa
985c062549 format code 2019-06-22 10:56:03 +08:00
vigarbuaa
17fe9bf914 remove not used rest_client
1. "json的内容可以通过设置Content-Type为application/json达成,没必要单独增加一个json字段。" remove not used code
2.  在alpaca撤单调试过程中,发生返回值200,但body.text是json的情况,致rest_client解析json报错,加了try/catch做处理
2019-06-22 10:51:50 +08:00
vigarbuaa
08d3b26a5d remove debug print info 2019-06-22 10:22:04 +08:00
vigarbuaa
9124302cca add process_timer_event to query account and position 2019-06-21 22:31:30 +08:00
vigarbuaa
2dd33b5ba0 add subscribe func 2019-06-21 13:26:40 +08:00
vigarbuaa
0753e3cfe2 add cancel order fun for alpaca 2019-06-20 22:24:18 +08:00
vigarbuaa
04b0da5ce5 add try/catch to json parse func
rest_client认为每个返回都可解为json,在处理alpaca的撤单操作时报错
2019-06-20 22:24:03 +08:00
vn.py
e44ad6955c Merge branch 'dev' of https://github.com/vnpy/vnpy into dev 2019-06-20 15:46:56 +08:00
vn.py
102707cf30 [Mod]change load history data cache size 2019-06-20 15:46:49 +08:00
nanoric
ae09a14cdf [Del] ToraGateway: remove order type of MarketPrice . 2019-06-19 17:50:19 +08:00
vn.py
287448c611
Merge pull request #1842 from 1122455801/binance_mod_0617
[Mod] binance_gateway
2019-06-18 23:35:57 +08:00
vn.py
fe87eac546
Merge pull request #1847 from 1122455801/mod_sql_0618
[Mod] 修复database_sql缺失字段
2019-06-18 23:32:48 +08:00
vigarbuaa
eb691525fc cancel order successful
send cancel req by rest_client
receive reponse by websocket

...  need to debug
2019-06-18 23:13:41 +08:00
1122455801
000d19afc8 Update database_sql.py 2019-06-18 15:38:05 +08:00
1122455801
874bc7e4ed Update rest_client.py 2019-06-18 14:32:56 +08:00
vn.py
1017420b7a [Mod] update vnstudio 2.0.4 download link 2019-06-17 16:25:32 +08:00
1122455801
5a1adf2acc Update binance_gateway.py 2019-06-17 15:45:49 +08:00
vn.py
550c8eb810 [Mod]update download link of vnstudio 2019-06-17 11:01:57 +08:00
vn.py
93abb0a0a8 [Mod]update README.md 2019-06-16 16:11:42 +08:00
vn.py
7d8caba62d Merge branch 'dev' of https://github.com/vnpy/vnpy into dev 2019-06-16 15:25:11 +08:00
vn.py
ab605767b6 [Add] more log output for arbitrage algo 2019-06-16 15:25:06 +08:00
vn.py
6909588b9c
Merge pull request #1836 from 1122455801/backtesting_mod_0615
[Mod] 回测引擎增加日期过滤
2019-06-16 14:34:39 +08:00
vn.py
0aa1bda8df [Mod] change logic of arbitrage algo 2019-06-15 23:58:10 +08:00
1122455801
ffebdd2ecd Update backtesting.py 2019-06-15 19:00:06 +08:00
vigarbuaa
1e0248ce5c add swicht {real, paper} url function 2019-06-15 15:07:07 +08:00
vigarbuaa
e8e2e1121d websocket stream and auth and listening stream 2019-06-15 13:45:50 +08:00
vigarbuaa
7be2a90e4c add websocket into alpaca 2019-06-15 11:19:15 +08:00
vn.py
961f7366a3
Merge pull request #1833 from nanoric/dev
[Mod] support for PyQt5>=5.12 is satisfied
2019-06-14 22:08:34 +08:00
nanoric
585e4c9e8e Merge remote-tracking branch 'remotes/nanoric/pyqt5_512' into dev 2019-06-14 19:40:07 +08:00
nanoric
a1c33cf9f9 [Mod] database_mongo.py: make flake8 happy
[Mod] database_sql.py: make flake8 happy
2019-06-14 19:06:02 +08:00
nanoric
64633b9d30 [Mod] support for PyQt5>=5.12 is satisfied 2019-06-14 18:40:03 +08:00
vn.py
ad36f0ead4 [Mod] change logic of grid algo 2019-06-14 16:03:45 +08:00
vn.py
23792474b1
Merge pull request #1829 from 1122455801/bitmex_0614
[Mod] bitmex_gateway增加持仓推送过滤
2019-06-14 15:44:43 +08:00