Commit Graph

96 Commits

Author SHA1 Message Date
huili 6d9feb0bc4
Merge pull request #4481 from taosdata/hotfix/TD-2364
Hotfix/td 2364
2020-12-08 16:42:45 +08:00
zyyang 97b64d5654 [TD-2364]<fix>: fix mybatis-plus pagenation exceptions 2020-12-08 11:07:11 +08:00
Shengliang Guan 5aef8c57ac Re implement the TD-1925 code because it cannot merge 2020-12-07 12:57:35 +08:00
stephenkgu 9c194c6eb8 Merge branch 'release/s107' of https://github.com/taosdata/TDengine into release/s107 2020-12-04 17:09:23 +08:00
zyyang 1e4c61bb26 change jdbc version number 2020-12-04 14:13:40 +08:00
plum-lihui 030fc35958 change version number 2020-12-04 13:48:14 +08:00
huili b2aadbb896
Merge pull request #4323 from taosdata/feature/TD-1859
Feature/td 1859
2020-11-25 17:54:42 +08:00
zyyang 5e91e8e307 change 2020-11-23 19:28:45 +08:00
plum-lihui 30e18f31b7 change version number 2020-11-20 20:08:41 +08:00
huili b4e8f00a4c
Merge pull request #3981 from freemine/odbc
odbc connector, keep going
2020-11-19 14:49:22 +08:00
zyyang 5a207951ec change version 2020-11-14 10:33:46 +08:00
Hui Li 86625df80a [none] 2020-11-11 15:26:59 +08:00
Hui Li 031ab3b737 [2028]<feature> add C# connector for windows 2020-11-10 17:19:14 +08:00
freemine 546e7d8584 odbc install directive moves into odbc-sub-module; client_to_env when SQL_CHAR in SQLExecDirect 2020-10-31 16:24:59 +08:00
freemine 32b3c2e65e install ODBC driver components if only flex was found 2020-10-31 00:43:07 +08:00
freemine cc496e12bb add todbcinst to help user install/uninstall taos odbc driver 2020-10-28 13:47:32 +08:00
Hui Li f830a04240 change version number 2020-10-23 09:25:07 +08:00
zyyang 84757a2412 update jdbc driver version 2020-10-20 13:00:41 +08:00
Shengliang Guan efec15d267 compiled error in wn32 2020-10-15 13:59:08 +08:00
Hui Li aed51263c8 package taoserror.h into windows client 2020-10-14 14:28:49 +08:00
Hui Li f01c0e7630 update the version.inc 2020-10-12 17:57:32 +08:00
Hui Li c1d31e5e25 release/s103 2020-10-10 20:09:00 +08:00
Shengliang Guan 5f97a7b400 TD-1530 2020-09-29 13:43:17 +08:00
Shengliang Guan 05687d1eba TD-1530 minor changes 2020-09-28 22:30:34 +08:00
Shengliang Guan e32e507e1f TD-1530 2020-09-28 14:29:23 +08:00
Shengliang Guan 2811c96b30 TD-1530 2020-09-28 10:29:49 +08:00
Shengliang Guan 16969d0d88 Merge remote-tracking branch 'origin/develop' into feature/os 2020-09-27 07:12:22 +00:00
Hui Li 1f4d0b0c13 [TD-1465] 2020-09-27 13:28:37 +08:00
Shengliang Guan fb064f5337 minor changes 2020-09-22 10:52:43 +00:00
Hui Li d10a3cdd11 [update version info] 2020-09-22 15:28:12 +08:00
Shuduo Sang e7099d5518 add void cast to solve unused variables. 2020-09-16 11:02:36 +08:00
Shuduo Sang af08259379 Merge branch 'develop' into hotfix/sangshuduo/fix-compile-error-for-release 2020-09-16 11:00:22 +08:00
Shuduo Sang ab198e6fd7 disable warning for self assign. 2020-09-16 10:47:47 +08:00
Shuduo Sang e544363106 [TD-1459] <fix>: fix compile error for release build type. 2020-09-15 18:56:32 +08:00
Hui Li 53c4f51116 [TD-1427] 2020-09-15 18:21:40 +08:00
root 07b38c1cac Merge remote-tracking branch 'origin/develop' into feature/mqtt 2020-09-07 11:24:24 +08:00
Hui Li eb9a1f9655 [issue:3375] 2020-09-05 12:58:36 +08:00
Shengliang Guan 59966c953b
Merge pull request #3389 from taosdata/release/s101
Release/s101
2020-09-05 11:25:55 +08:00
Hui Li 563a90f46a update the version 2020-09-05 10:57:38 +08:00
Shengliang Guan fb9c2f4eff minor changes 2020-09-05 02:27:27 +00:00
Shengliang Guan 6aa2db02bb Merge from develop 2020-09-05 02:22:15 +00:00
Hongze Cheng 7f56ba6056 TD-1027 2020-09-04 15:09:04 +08:00
Shengliang Guan 011ca825f9 TD-1310 Refactor the mqtt module codes 2020-09-03 14:29:40 +00:00
Shengliang Guan d75ce1715e TD-1310 2020-09-02 10:52:32 +00:00
Hui Li 72199cacdf [TD-1305] 2020-09-02 13:19:16 +08:00
Hui Li 5ab467451d [modify taosc name for oem power] 2020-09-01 15:19:20 +08:00
Hui Li 8f57775923 [modify oem macro define] 2020-08-31 11:34:55 +08:00
Hui Li 2aa54b4ec7 [TD-1228] 2020-08-29 16:04:41 +08:00
Hui Li 57ec385903 [TD-1228] 2020-08-29 15:45:02 +08:00
Shengliang Guan 2420c8c5c6 minor changes 2020-08-28 15:48:03 +08:00