Commit Graph

2708 Commits

Author SHA1 Message Date
vn.py
02c4a88f02
Merge pull request #1914 from nanoric/fix_unhandled_exception_in_websocket.reconnect
[Mod] Fixed: exception raised in WebsocketClient._reconnect() may not …
2019-07-12 14:24:49 +08:00
vn.py
09d99964e5 [Fix]ctp cancel order needs correct ExchangeID 2019-07-10 17:07:01 +08:00
nanoric
90592ecafb [Mod] Fixed: exception raise in WebsocketClient._reconnect() may not be captured in some case. 2019-07-10 15:43:36 +08:00
vn.py
0fb929e66c Merge branch 'dev' of https://github.com/vnpy/vnpy into dev 2019-07-10 10:15:21 +08:00
vn.py
62a0451d41 [Fix]closes #1913 2019-07-10 10:15:15 +08:00
nio
5eab77cc9d okex 现货和合约深度数据重复修改
okex 现货和合约深度数据重复修改
2019-07-09 22:00:54 +08:00
vn.py
7f7d12e4bf
[Merge] pull request #1908 from vnpy/dev, closes #1906
Dev
2019-07-09 16:16:11 +08:00
vn.py
f3d7a4f06b
Merge pull request #1907 from tonywanggit/dev
去除SUPPORT文件项目论坛后链接的多余空格
2019-07-09 16:13:04 +08:00
tony
de5e55b615 去除项目论坛后链接的多余空格 2019-07-09 08:59:00 +08:00
nioss
bc219e4b89
Merge pull request #2 from vnpy/dev
2.0.5 Dev
2019-07-07 22:57:36 +08:00
vn.py
f6066681e1
Merge pull request #1904 from nanoric/linux_no_oes
Update setup.py
2019-07-05 22:22:30 +08:00
nanoric
69638d3ef1
Update setup.py
setup.py : Build vnoes for default .
2019-07-05 18:45:41 +08:00
vn.py
36524511b2
Merge pull request #1903 from nanoric/linux_no_oes
Linux no oes
2019-07-05 17:41:38 +08:00
nanoric
039ec5980d [Mod] travis.yml: remove -j option under gcc-7 2019-07-05 15:09:49 +08:00
nanoric
099b5292fe [Mod] skip tests if extensions not built. 2019-07-05 14:50:36 +08:00
nanoric
574853d5a1 [Add] use make -j under travis-gcc7 2019-07-05 14:50:04 +08:00
nanoric
e3ffe9126f [Mod] make setup.py more simple 2019-07-05 14:49:25 +08:00
nanoric
9b503435bf [Mod] travis ci: not to build vnoes(not enough memory) 2019-07-05 14:34:11 +08:00
nanoric
17cf6a3d5c [Add] build option to switch whether to build oes api or not 2019-07-05 14:33:04 +08:00
nanoric
304072f96d [Mod] tests_import_all: skip importing XTP under OSX 2019-07-05 12:40:06 +08:00
nanoric
a8f06a0139 [Mod] autocxxpy: ignore types not exists under Linux 2019-07-05 11:17:30 +08:00
nanoric
1e49a0aa1d [Mod] updated autocxxpy: generate caster for only classes and enums 2019-07-05 09:58:10 +08:00
nanoric
9db0dfdcbb [Mod] updated autocxxpy: added noexcept for async_dispatch_exception::what() 2019-07-05 09:04:13 +08:00
vn.py
d03f0a4a9e
Merge pull request #1899 from vnpy/dev
[Add] clear_button to clear log monitor
2019-07-03 21:12:05 +08:00
vn.py
82dd0d0ea6 [Add] clear_button to clear log monitor 2019-07-03 21:02:37 +08:00
nanoric
50a212bf5a [Mod] use autocxxpy 0.4.1 2019-07-03 16:49:08 +08:00
nanoric
ee717a69b8 [Mod] fixed headers and libs path for oes gateway 2019-07-03 16:10:50 +08:00
vn.py
4f9bf0884f
Merge pull request #1898 from vnpy/dev
v2.0.5
2019-07-03 15:28:21 +08:00
vn.py
5eded16f48 [Add] send_email function to ScriptEngine 2019-07-03 13:19:17 +08:00
vn.py
afa7f1a227 [Add] demo_script.py for ScriptTrader 2019-07-03 11:28:08 +08:00
nanoric
5d555e2a46 [Mod] sources of oes_gateway was changed. 2019-07-03 11:06:32 +08:00
vn.py
2125bc6a27 [Mod] change cta strategy manager ui to use fixed height, closes #1890 2019-07-02 23:32:36 +08:00
vn.py
138b118a3d Merge branch 'dev' of https://github.com/vnpy/vnpy into dev 2019-07-02 23:00:09 +08:00
vn.py
4d0e1afa5b [Fix] close #1887 2019-07-02 22:59:59 +08:00
vn.py
f5e468741a
Merge pull request #1896 from LimingFang/dev
Update cta_strategy.md
2019-07-02 22:20:54 +08:00
vn.py
ca16e4b58e [Mod] change connect_status control 2019-07-02 18:06:12 +08:00
vn.py
01dbd2915d [Mod] change examples folder name 2019-07-02 17:53:35 +08:00
vn.py
2c0362b3c5 [Mod] ScriptEngine add support to return DataFrame 2019-07-02 17:33:12 +08:00
LimingFang
9748a1ff89
Merge pull request #2 from LimingFang/pr/1
Pr/1
2019-07-02 17:17:49 +08:00
LimingFang
d08274640c
Merge branch 'dev' into pr/1 2019-07-02 17:17:20 +08:00
vn.py
1ed35377e6 [Add] demo jupyter notebook for cli trading 2019-07-02 16:55:00 +08:00
LimingFang
c4d1273ab2 Update quickstart.md 2019-07-02 16:50:36 +08:00
LimingFang
72b8893592 Update quickstart.md 2019-07-02 16:49:41 +08:00
vn.py
2906ac724a [Mod] update readme.md 2019-07-02 16:48:05 +08:00
LimingFang
10bd69297c Update cta_strategy.md 2019-07-02 16:35:42 +08:00
vn.py
131cedc0bb
Merge pull request #1894 from nanoric/new_oes_0.15.9
[Mod] OesGateway: Update api version to 0.15.9
2019-07-02 15:50:42 +08:00
nanoric
07079f8c13 [Mod] built new pyd 2019-07-02 15:25:17 +08:00
nanoric
d29f8c71b8 [Mod] oes_gateway: change code to adapt 0.15.9 version api 2019-07-02 15:25:07 +08:00
nanoric
0f3b96ee8f [Mod] apply 0.15.9 headers, libs, dlls, .a . 2019-07-02 15:13:32 +08:00
vn.py
838727f015 [Mod] rename variable 2019-07-02 14:57:26 +08:00