dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,162 Commits 106 Branches 71 Tags
Commit Graph

2162 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Volodymyr Babak
37aaa81bc0 Merge branch 'master' of github.com:thingsboard/thingsboard 2019-02-13 18:19:39 +02:00
Volodymyr Babak
0a7032ddc1 Fixed isFixedPartitioning function to equals to correct class instance 2019-02-13 18:19:33 +02:00
Igor Kulikov
bf14c3a955
Merge pull request #1478 from MrKartoshka/master 
polygon color function fix for multiply dataSources
 2019-02-13 14:16:58 +02:00
Igor Kulikov
d863ecfa6b Improve rule node executors to use work stealing thread pool. Use shared event loop for Mqtt rule nodes. 2019-02-13 14:15:14 +02:00
Maksym Dudnik
afc02e72c1 polygon color function fix for multiply datasources 2019-02-13 12:28:41 +02:00
Igor Kulikov
34bc51903c Ability to trace script body executed by JS Executor microservice. 2019-02-12 17:17:50 +02:00
Igor Kulikov
8fdfacf492 Update JS packages version to 2.3.1 2019-02-12 17:17:16 +02:00
Igor Kulikov
e0ab0159fb Version set to 2.3.1-SNAPSHOT 2019-02-12 17:16:24 +02:00
Albert
9bd4c85eae fix regEx 2019-02-08 18:03:27 +02:00
Geremia Taglialatela
afdbc71db4 Add missing Italian translations 
Also fixes some missing translations and typos

Close: #1453
 2019-02-08 18:02:00 +02:00
Igor Kulikov
401d4b2258
Merge pull request #1463 from thingsboard/release-2.3 
Add ability to use SimpleClientHttpFactory for RestApiCallNode.
 2019-02-06 18:31:18 +02:00
Igor Kulikov
ce629fd035 Add ability to use SimpleClientHttpFactory for RestApiCallNode. v2.3 2019-02-06 18:28:09 +02:00
Igor Kulikov
7ff0ecd7e5 Version set to 2.3.0 2019-02-06 17:38:19 +02:00
Igor Kulikov
82b57e1cf8 Add upgrade from 2.2.0 to 2.3.0 2019-02-06 17:34:03 +02:00
Igor Kulikov
cd1d60c9e5 Merge branch 'master' into develop/2.3 2019-02-06 17:30:47 +02:00
Igor Kulikov
909b6d0f4c
Merge pull request #1461 from MrKartoshka/master 
polygon update
 2019-02-06 17:07:02 +02:00
Maksym Dudnik
e9328f9e11 Removed polygon latLnag dependency and added polygon marker and click event 2019-02-06 16:53:15 +02:00
Igor Kulikov
f947c04fd3
Merge pull request #1458 from vparomskiy/master 
skip JPA TsKVEntry initialization if no data found
 2019-02-06 16:46:10 +02:00
vparomskiy
178db50d32 skip JPA TsKVEntry initialization if no data found 2019-02-06 14:51:46 +02:00
ShvaykaD
75b1f84805 Feature/relation nodes (#1452) 
* modified relation-action-nodes

* add rule node description

* fix rule node description

* fix typo

* updated relation-action-nodes
 2019-02-06 12:54:55 +02:00
Igor Kulikov
ed636a261b Merge branch 'master' into develop/2.3 2019-02-04 20:26:50 +02:00
Igor Kulikov
9eb1cd911b Improve asset/device type autocomplete. 2019-02-04 20:26:29 +02:00
Igor Kulikov
f7d026ac1d Merge with master 2019-02-01 18:48:08 +02:00
Igor Kulikov
3f9f3d1a2d Merge branch 'master' into develop/2.3 2019-02-01 18:46:51 +02:00
Igor Kulikov
3108bbbb68
Merge pull request #1448 from thingsboard/feature/make-entity-view-public 
Make entity view public again:
 2019-02-01 18:46:04 +02:00
Volodymyr Babak
aa7deb2f3e Make entity view public again: 2019-02-01 17:45:58 +02:00
Igor Kulikov
bdb912d10f Update License Header year to 2019 2019-02-01 16:40:37 +02:00
Igor Kulikov
6062ba0143 Merge branch 'master' into develop/2.3 2019-02-01 16:39:56 +02:00
Igor Kulikov
ced63c4e70 Update License Header year to 2019 2019-02-01 16:39:33 +02:00
Igor Kulikov
ded035b927 Merge branch 'master' into develop/2.3 2019-02-01 15:20:39 +02:00
Igor Kulikov
0d5cb8d88b
Merge pull request #1447 from jktu2870/input_widgets 
UI:fix(#1427). "Input" widgets (boolean) save wrong value
 2019-02-01 15:20:17 +02:00
Igor Kulikov
7952f8d5b3
Merge pull request #1446 from MrKartoshka/map_fix 
Fix init fit to bounds
 2019-02-01 15:19:39 +02:00
Igor Kulikov
83a499e004 IE fix: String.includes polyfill 2019-02-01 15:18:20 +02:00
Maksym Dudnik
0fd84dc311 Fix init fit to bounds 2019-02-01 15:08:19 +02:00
okolesnik
54eb3a3e88 UI:fix(#1427). "Input" widgets (boolean) save wrong value 2019-02-01 15:03:04 +02:00
Andrew Shvayka
50e9602409
Merge pull request #1437 from ShvaykaD/feature/TbCheckMessageNode 
Feature/tb check message node
 2019-02-01 14:54:59 +02:00
Igor Kulikov
acb490fe88 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/2.3 2019-02-01 12:33:43 +02:00
Igor Kulikov
64777841d6
Merge pull request #1445 from Terny22/improvement/chart-label-position 
Fixed issue with chart-tooltip vertical position
 2019-02-01 12:32:22 +02:00
Sergey Tarnavskiy
88f11d4322 fixed issue with chart-label vertical position 2019-02-01 12:12:38 +02:00
ShvaykaD
71bd05fdf8 Merge branch 'master' of github.com:thingsboard/thingsboard into feature/TbCheckMessageNode 2019-02-01 12:00:01 +02:00
ShvaykaD
7f639655ee fix typo 2019-02-01 11:58:02 +02:00
ShvaykaD
e2b9420abd Update TbCheckMessageNode 2019-02-01 11:56:00 +02:00
Igor Kulikov
915d1f683c Merge branch 'master' into develop/2.3 2019-01-31 20:31:50 +02:00
Igor Kulikov
818e4b315a Add Persian language. 2019-01-31 20:30:39 +02:00
Igor Kulikov
d78202018a
Merge pull request #1441 from vparomskiy/master 
cache webpack resources and run loaders in concurrent mode
 2019-01-31 20:08:57 +02:00
Igor Kulikov
90c3a2b533 Improve Jpa Timeseries DAO. Fixed SQL Warning Code: -1003. Issue #925, Issue #397. 2019-01-31 19:38:03 +02:00
vparomskiy
e9e10d74b8 cache webpack resources and run loaders in concurrent mode 2019-01-31 16:09:50 +02:00
vparomskiy
094ef761cd Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	dao/src/main/java/org/thingsboard/server/dao/timeseries/AggregatePartitionsFunction.java
 2019-01-31 16:07:14 +02:00
vparomskiy
c646096d40 Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	dao/src/main/java/org/thingsboard/server/dao/timeseries/AggregatePartitionsFunction.java
 2019-01-31 16:07:09 +02:00
Andrew Shvayka
7358b4a79b Implemented MIN/MAX/AVG/SUM/COUNT calculation for mixed number data types 2019-01-31 15:31:29 +02:00