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

2374 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ShvaykaD
4513655771 Merge branch 'master' of github.com:thingsboard/thingsboard into feature/relation-nodes 2019-02-06 10:35:51 +02:00
ShvaykaD
8bdae299c6 updated relation-action-nodes 2019-02-06 10:35:27 +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
ShvaykaD
cc1a83a512 fix typo 2019-02-04 17:26:55 +02:00
ShvaykaD
5953c04c64 fix rule node description 2019-02-04 16:36:03 +02:00
ShvaykaD
fd8e522512 add rule node description 2019-02-04 16:32:50 +02:00
nordmif
c05656443d Merge branch 'master' of github.com:thingsboard/thingsboard 2019-02-04 14:33:57 +02:00
ShvaykaD
4f0ecd6f47 merge with upstream/master 2019-02-04 13:58:41 +02:00
ShvaykaD
e8ee4b0d2b modified relation-action-nodes 2019-02-04 13:56:02 +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
vparomskiy
66c0e7179e aggregation for numeric data types should process both types - double and long 2019-01-31 15:31:29 +02:00
Igor Kulikov
67293b5fa4 Update Referencing RuleChains when RuleChain is deleted. 2019-01-31 13:13:39 +02:00
ShvaykaD
01a20c567c modify TbCheckMessageNode 2019-01-31 12:59:07 +02:00
ShvaykaD
8b273e9474 update TbCheckMessageNode 2019-01-31 11:27:45 +02:00
ShvaykaD
4d894ea404 merge with upstream 2019-01-31 11:16:03 +02:00
ShvaykaD
ddc2c73717 add TbCheckMessageNode 2019-01-31 11:14:09 +02:00
Igor Kulikov
a1e8ed8ff4 Merge branch 'master' into develop/2.3 2019-01-30 19:28:26 +02:00
Igor Kulikov
b1849e98f7
Merge pull request #1394 from janbols/fst 
Use a fast serialization library like FST for serialization of TbActo…
 2019-01-30 19:27:22 +02:00
Igor Kulikov
0d91554655 Merge branch 'MrKartoshka-map_update_polygons' 2019-01-30 19:26:20 +02:00