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
Igor Kulikov
136526cd80
Merge conflicts
2019-01-30 19:26:00 +02:00
Igor Kulikov
d50db7a3dd
Merge pull request #1409 from andyesys/master
...
Add German UI translation
2019-01-30 19:11:54 +02:00
ShvaykaD
0f0b823d0a
init commit
2019-01-30 18:46:30 +02:00
Igor Kulikov
755d0f56c1
Merge branch 'master' into develop/2.3
2019-01-30 17:09:38 +02:00
Igor Kulikov
908cd0ef64
Improve device/asset/entityView type autocomplete.
2019-01-30 17:03:32 +02:00
Valerii Sosliuk
9aed06a37b
delete alarm api added ( #1431 )
...
* delete alarm api added
* delete alarm api added
2019-01-30 14:25:39 +02:00
Maksym Dudnik
43b0ac6b5b
Added polygon functional for OpenStreet, Tencent and Google Latest Value Maps
2019-01-30 11:21:07 +02:00
nordmif
91ec610921
Merge branch 'master' of github.com:thingsboard/thingsboard
2019-01-30 11:18:38 +02:00
Valerii Sosliuk
06f5dfd1da
Relation node fix ( #1426 )
...
* Fix NPE in netty-mqtt client on puback
* Fix gateway mqtt extension configuration - filter is not required
* device type expression in mqtt extension config is not required
* Relation nodes: to and from Ids mad elocal variables
2019-01-29 16:42:34 +02:00
Valerii Sosliuk
ef8604a21e
Clear alarm metadata type ( #1425 )
...
* Fix NPE in netty-mqtt client on puback
* Fix gateway mqtt extension configuration - filter is not required
* device type expression in mqtt extension config is not required
* Metadata parameter usage added to Clear Alarm Node
* rulenode-core-config.js updated
2019-01-29 10:54:38 +02:00
Igor Kulikov
6a132082c4
Fix docker upgrade script
2019-01-28 19:42:55 +02:00
ShvaykaD
b966abb3e6
Feature/relation nodes ( #1414 )
...
* modify TbCheckRelationNode
* fix TbCheckRelationNode
* modify TbDeleteRelationNode
* fix rule-nodes description
* fix rule-nodes ui
* fix relation action nodes
2019-01-28 16:33:57 +02:00
Igor Kulikov
eb33ffcc4a
Improve Data Update Service.
2019-01-28 16:22:40 +02:00
nordmif
8509d045a1
Merge branch 'master' of github.com:thingsboard/thingsboard
2019-01-28 15:55:13 +02:00
