Commit Graph

1098 Commits

Author SHA1 Message Date
slguan 6fb9ee3395 Merge branch 'develop' into feature/slguan 2019-12-05 16:50:34 +08:00
slguan 341d186e4b
Merge pull request #858 from taosdata/hotfix/#856
Hotfix/#856
2019-12-05 15:47:16 +08:00
slguan a425bb51c6
Merge pull request #857 from taosdata/hotfix/#856
fix #856
2019-12-05 15:46:37 +08:00
Hongze Cheng cff3009a41 fix #856 2019-12-05 15:40:09 +08:00
Bomin Zhang 0b40d39df2
Merge pull request #855 from taosdata/feature/lihui
[TBASE-1288]
2019-12-05 11:16:30 +08:00
plum-lihui 8357e5c371
Merge pull request #854 from taosdata/feature/fangdoc
Feature/fangdoc
2019-12-05 11:15:16 +08:00
lihui 60629d31d6 [TBASE-1288] 2019-12-05 11:05:14 +08:00
fang 2a6cfdfbab Merge branch 'feature/fangdoc' of https://github.com/taosdata/TDengine into feature/fangdoc 2019-12-05 10:08:29 +08:00
fang a0b79bd771 python connector user guide 2019-12-05 10:06:56 +08:00
slguan 39ace3f38e fix some log errors 2019-12-05 09:31:42 +08:00
slguan b908772583
Merge pull request #849 from taosdata/feature/liaohj
Feature/liaohj
2019-12-04 18:44:50 +08:00
hjxilinx 372ac9c27d [tbase-1282] 2019-12-04 18:38:31 +08:00
hjxilinx 30975a7432 [tbase-1189] 2019-12-04 18:36:40 +08:00
hjxilinx ae9a948ba3 [tbase-897] 2019-12-04 18:35:10 +08:00
hjxilinx 888ddaeba4 add timezone configuration in the taos.cfg 2019-12-04 18:29:44 +08:00
fangpanpan 1207eb1f91
Merge pull request #847 from taosdata/feature/lihui
Feature/lihui
2019-12-04 16:13:04 +08:00
lihui 886b9aac4b [TBASE-816] 2019-12-04 16:10:18 +08:00
lihui 63f6d35e68 Merge branch 'develop' into feature/lihui 2019-12-04 16:09:15 +08:00
lihui 641c1e44d0 [TBASE-816] 2019-12-04 16:07:25 +08:00
plum-lihui 54b0d8f5dc
Merge pull request #830 from Allenscript/fix_raspbian_compile_atomic_not_found_error
fix compile for raspbian on RaspberryPI 4B atomic not found error
2019-12-04 16:06:39 +08:00
slguan 54ebcfd719
Merge pull request #846 from taosdata/hjxilinx-patch-2-1
Hjxilinx patch 2 1
2019-12-04 16:06:01 +08:00
slguan c78474e95d
Merge branch 'develop' into hjxilinx-patch-2-1 2019-12-04 16:05:53 +08:00
haojun Liao 24a8e3a65b
Update administrator-ch.md 2019-12-04 15:56:59 +08:00
fangpanpan fd684bf212
Merge pull request #843 from taosdata/hjxilinx-patch-2
Update administrator-ch.md
2019-12-04 15:13:22 +08:00
haojun Liao 3c283b3d2b
Update administrator-ch.md 2019-12-04 14:36:01 +08:00
haojun Liao fccf3c2d7d
Update administrator-ch.md 2019-12-04 13:45:42 +08:00
slguan d019ee0c80 add some logs 2019-12-04 10:48:16 +08:00
slguan db5e538fc5 remove some logs 2019-12-04 10:26:31 +08:00
slguan a6b71410b2
Merge pull request #840 from taosdata/feature/fangdoc
Feature/fangdoc
2019-12-04 10:05:30 +08:00
slguan 9f0f832141
Merge branch 'develop' into feature/fangdoc 2019-12-04 10:04:45 +08:00
slguan 527027d5f9
Merge pull request #844 from taosdata/feature/liaohj
[tbase-1269]
2019-12-04 10:03:27 +08:00
fang ccb02180f4 Chinese version for node.js connector 2019-12-04 09:10:49 +08:00
fang 5a00db8e42 Chinese version for node.js connector 2019-12-04 09:04:57 +08:00
haojun Liao 90b3558e97
Update administrator-ch.md
add more information about client configuration.
2019-12-03 22:43:22 +08:00
haojun Liao c2d353f543
Update administrator-ch.md
add more information about client configuration.
2019-12-03 22:43:20 +08:00
fangpanpan 53ef108297
Merge pull request #838 from taosdata/feature/slguan
windows client user manual
2019-12-03 20:34:27 +08:00
slguan b5d71c294b
Merge pull request #836 from taosdata/feature/liaohj
[tbase-1269]
2019-12-03 19:01:54 +08:00
slguan ee33d78494 windows client user manual 2019-12-03 19:00:24 +08:00
fangpanpan 30161abedf
Merge pull request #835 from taosdata/feature/slguan
C # usage
2019-12-03 17:40:11 +08:00
slguan b4c78bf96a
Merge pull request #832 from taosdata/feature/fangdoc
python connector user guide
2019-12-03 17:39:11 +08:00
slguan bff25a36a4 C # usage 2019-12-03 17:37:10 +08:00
fangpanpan b2c24b6214
Merge pull request #833 from taosdata/feature/lihui
Feature/lihui
2019-12-03 15:31:57 +08:00
lihui 8fb2d0c03e [TBASE-816] 2019-12-03 15:22:35 +08:00
lihui 9a659e3b4d [TBASE-816] 2019-12-03 15:11:04 +08:00
fang c933b3ea68 python connector user guide 2019-12-03 14:12:31 +08:00
fangpanpan 01fcd4de73
Merge pull request #831 from taosdata/feature/lihui
[TBASE-816]
2019-12-03 13:56:44 +08:00
lihui 13298fe5d6 [TBASE-816] 2019-12-03 13:54:33 +08:00
Allenscript 61f1506d3c fix compile for raspbian on RaspberryPI 4B atomic not found error 2019-12-03 13:07:42 +08:00
plum-lihui b1fe428721
Merge pull request #825 from taosdata/release/v1.6.4.1
Release/v1.6.4.1
2019-12-03 10:13:05 +08:00
fangpanpan 1eda3f1b21
Merge pull request #816 from taosdata/feature/slguan
Instructions for using the RESTful interface
2019-12-03 10:12:27 +08:00