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

2884 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Kulikov
0ef930e43a Set version 2019-12-23 18:28:46 +02:00
Vladyslav_Prykhodko
caa7b8f420 Merge remote-tracking branch 'upstream/master' 2019-12-23 18:22:30 +02:00
Igor Kulikov
7bdbdad287 upgrade from version 2.4.2 2019-12-23 17:46:48 +02:00
Igor Kulikov
664edfd178 Merge branch 'Karabiy-CopyToView' 2019-12-23 17:41:34 +02:00
Igor Kulikov
93e33517c1 Fix merge conflicts. 2019-12-23 17:41:23 +02:00
Albert Yurgin
a490f02a29 fixed interpolation error (#2290) 2019-12-23 17:36:29 +02:00
Chantsova Ekaterina
a93c8e25ba Hide timewindow when all options are hidden (#2287) 
* Hide timewindow when all options are hidden

* Disable timewindow button when all options hidden
 2019-12-23 17:35:49 +02:00
Vladyslav
6ba0b943e8 Create new dataKey type entityField (#2282) 
* Add support import label

* Create new dataKey type entityField

* Add translate to entityField
 2019-12-23 17:35:04 +02:00
Chantsova Ekaterina
825406690c Flot widget pull requests: resolve conflicts for #2053, #2061 (#2289) 
* Add some datakey settings to edit legend appearance for flot widget

* Fix timestamp and index search in 'line' flot charts tooltip

Co-authored-by: Mirco Pizzichini <52463156+mircopz@users.noreply.github.com>
 2019-12-23 15:45:27 +02:00
Oleg Kolesnik
518e9ac941 Control widgets background color (#2286) 
* UI:fix. Dashboard (widgets order mobile view)

* UI:fix. Control widgets (background-color setting doesn't work for some of them)
 2019-12-23 15:31:47 +02:00
Mirco Pizzichini
4f8616d0af Fix timewindow parameters when zooming flot widget chart (#2271) 2019-12-23 15:08:00 +02:00
Michael Hamburger
cea1381482 add upgrade_dev_db.sh script, which allows to upgrade an already existing developer database (#2267) 2019-12-23 15:07:12 +02:00
Michael Hamburger
89dbad2cf7 added delete alarm to ui service (#2266) 2019-12-23 15:06:29 +02:00
Vladyslav_Prykhodko
5a9f4e001e Merge remote-tracking branch 'upstream/master' 2019-12-20 18:23:56 +02:00
Andrew Shvayka
a1c2d85f90
Merge pull request #2281 from thingsboard/feature/alarm-propagate 
Alarm Propagation by Relation Type
 2019-12-20 18:22:25 +02:00
Andrew Shvayka
1b4ef0c9fa Latest UI 2019-12-20 17:42:07 +02:00
Andrew Shvayka
2b63f86d56 Merge remote-tracking branch 'origin/master' into ShvaykaD-improvements/alarm-propagate 2019-12-20 17:22:24 +02:00
Andrew Shvayka
3340c88be7 Merge with master 2019-12-20 17:22:12 +02:00
Dmytro Shvaika
29a29662e6 rule-node-ui-changes 2019-12-20 17:21:46 +02:00
vlad
d55c374e36 reverted password 2019-12-20 16:16:01 +02:00
Andrew Shvayka
95752ff3b9 Performance Improvement for Device State Service 2019-12-20 15:58:55 +02:00
Andrew Shvayka
cacdf09eef More clear thread names 2019-12-20 13:50:07 +02:00
vlad
958291549c Merge branch 'master' of https://github.com/thingsboard/thingsboard into CopyToView 2019-12-20 12:35:42 +02:00
vlad
0ea991019a Activity added 2019-12-20 12:32:12 +02:00
Andrew Shvayka
27d0fc3b0a Missing License Header 2019-12-20 12:12:33 +02:00
vlad
43503f9c61 Activity event support for Copy to view node added 2019-12-19 18:00:24 +02:00
Andrew Shvayka
91b07f6c90 Download Dependencies maven profile 2019-12-19 16:15:27 +02:00
Andrew Shvayka
cfe7e42602 JS Stats for Nashorn JS Executor 2019-12-18 18:24:28 +02:00
VoBa
f23cfc9880 Added device creation with token (#2272) 
* Added device creation with token

* Fixes after code review

* Added device creation with token
 2019-12-16 16:06:51 +02:00
Andrew Shvayka
a2cc974865 Critical Bug Fix for SQL inserts 2019-12-13 15:55:05 +02:00
Andrew Shvayka
acd4f06d9c Merge branch 'master' of github.com:thingsboard/thingsboard 2019-12-12 08:26:39 +02:00
Andrew Shvayka
bb05ce046b Suppress spam log message 2019-12-12 08:26:19 +02:00
Igor Kulikov
5bff61c2ca Improve JS Executor: add max active scripts parameter 2019-12-11 15:08:47 +02:00
Andrew Shvayka
da7da1ef76 Async JS Execution 2019-12-11 14:27:13 +02:00
Vladyslav
88434dec27 Improvement alarms widget limit (#2257) 
* Add support import label

* Add chunk size

* Refactoring and add template to max limit

* Add max number load alarms
 2019-12-11 13:57:39 +02:00
Igor Kulikov
c84a8a5e67 Version set to 2.5.0-SNAPSHOT 2019-12-10 15:25:03 +02:00
Andrew Shvayka
e1a43a9da1 Merge branch 'master' of github.com:thingsboard/thingsboard 2019-12-10 12:50:33 +02:00
Andrew Shvayka
f9abf1c7a2 Improved reporting of last activity time from remote transport 2019-12-10 12:50:20 +02:00
Vladyslav_Prykhodko
f0de0035b3 Merge remote-tracking branch 'upstream/master' 2019-12-10 12:18:43 +02:00
Igor Kulikov
5f80dbe4b5 Update upgrade version 2019-12-10 11:43:17 +02:00
Andrew Shvayka
752b3d90ab Removed redundant logging 2019-12-10 11:35:56 +02:00
Andrew Shvayka
7073095ed9
Merge pull request #2252 from YevhenBondarenko/feature/fix-logging 
added conditions for printing schedule logs
 2019-12-10 11:22:35 +02:00
Andrew Shvayka
3dd8336f01
Merge pull request #2253 from YevhenBondarenko/feature/batch-telemetry 
Feature/batch telemetry (fix nullPointer)
 2019-12-09 17:30:31 +02:00
Dmytro Shvaika
f9c65d709d code update 2019-12-09 15:57:26 +02:00
YevhenBondarenko
9a7f33a2e3 Merge branch 'master' of https://github.com/thingsboard/thingsboard into feature/batch-telemetry 2019-12-09 15:24:11 +02:00
YevhenBondarenko
fc95cabc7a fix nullPointer from method replaceNullChars 2019-12-09 15:22:29 +02:00
YevhenBondarenko
a6f7388c61 added conditions for printing schedule logs 2019-12-09 13:47:53 +02:00
Dmytro Shvaika
2af736fb33 Merge branch 'master' of github.com:thingsboard/thingsboard into improvements/alarm-propagate 2019-12-09 13:47:28 +02:00
Vladyslav_Prykhodko
47df6884a9 Merge remote-tracking branch 'upstream/master' 2019-12-09 13:00:13 +02:00
Vladyslav_Prykhodko
4c8e26e02c Merge branch 'master' of github.com:vvlladd28/thingsboard 2019-12-09 12:57:30 +02:00