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

3175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Kulikov
7d0661a826 Update package-lock verions 2020-01-16 18:42:40 +02:00
Igor Kulikov
580e751398 Use gradle-maven-plugin from org.thingsboard groupId 2020-01-16 18:29:51 +02:00
Igor Kulikov
25dc4e4e38 Use https for maven central 2020-01-16 14:42:33 +02:00
Igor Kulikov
d074933363 Fix travis build to use https maven gradle repository 2020-01-16 14:39:26 +02:00
Volodymyr Babak
feb9f07b47 Fixes to be in sync with minikube 1.6.2 2020-01-10 13:15:09 +02:00
Igor Kulikov
bd8d64de38 Update package.lock v2.4.3 2020-01-08 15:44:38 +02:00
Igor Kulikov
84bc9b77b1 Version set to 2.4.3 2020-01-08 15:34:05 +02:00
Igor Kulikov
f371dd5ee7 Merge branch 'master' into release-2.4 2020-01-08 15:33:05 +02:00
Igor Kulikov
82909d0a25 Version set to 2.5.0-SNAPSHOT 2020-01-08 15:32:58 +02:00
Igor Kulikov
2adfe0c31c Set docker upgrade from version to 2.4.2 2020-01-08 14:06:10 +02:00
Vladyslav
d1cfe65661 Fix entity name resolution (#2317) 2020-01-08 12:53:03 +02:00
Igor Kulikov
850d6d948c Update License header year to 2020 2020-01-06 16:52:41 +02:00
Igor Kulikov
1265a9a1e3 Revert "Update License header year to 2020" 
This reverts commit 9b42397c4a820688daf07117cb7efefa3f387f46.
 2020-01-06 16:48:55 +02:00
Igor Kulikov
9b42397c4a Update License header year to 2020 2020-01-06 16:41:04 +02:00
Vladyslav
3ba310dff0 Fix didn't disable timewindow button (#2312) 
* Add support import label

* Fix didn't disable timewindow button
 2020-01-06 16:39:51 +02:00
Li-Heng Yu
168f0d6481 Added Traditional Chinese Interface for Web UI (#2303) 
* Fixed other languages name in zh_CN ui

* Added Traditional Chinese for UI

* Added language name of Traditional Chinese for en_US pack

* Fixed zh_TW language pack and updated language usage
 2020-01-06 16:39:04 +02:00
Igor Kulikov
ac7eec2f6e Merge branch 'vvlladd28-feature/add_state_entityLabel' 2020-01-06 16:36:01 +02:00
Igor Kulikov
dc6127de90 Fix: Add entityLabel to handleWidgetAction 2020-01-06 16:35:48 +02:00
Vladyslav_Prykhodko
41a1c6679f Added support entity Label to state name and breadcrumb for dashboard 2019-12-27 18:06:31 +02:00
Vladyslav_Prykhodko
94663f25ea Merge remote-tracking branch 'upstream/master' 2019-12-26 18:04:33 +02:00
Vladyslav
92c1374a3f Fix knob control widget (#2298) 
* Add support import label

* Fix knob control widget
 2019-12-26 17:53:10 +02:00
Vladyslav_Prykhodko
06ad8b79c2 Merge remote-tracking branch 'upstream/master' 2019-12-26 12:01:09 +02:00
Vladyslav
45a4c6f342 Improvement/state entity name (#2294) 
* Add support import label

* Change enityName use targetEntityParam
 2019-12-24 16:17:01 +02:00
Vladyslav_Prykhodko
af63f82b91 Merge remote-tracking branch 'upstream/master' 2019-12-24 15:10:07 +02:00
Igor Kulikov
981f7443ce Improve resolveAliasFilter method 2019-12-24 14:23:35 +02:00
Igor Kulikov
8d45f32d8d Improve entity state controller. 2019-12-24 14:04:04 +02:00
Vladyslav
04f18a6fe8 Bugs entityFields dataKey (#2293) 
* Add support import label

* Fix not load and show first dataKey
 2019-12-24 13:30:02 +02:00
Vladyslav_Prykhodko
a77cefddd0 Merge remote-tracking branch 'upstream/master' 2019-12-23 19:21:38 +02:00
Vladyslav
aa7c946cb8 Improvement/new datakey types (#2291) 
* Add support import label

* Add translate tooltip
 2019-12-23 18:41:49 +02:00
Igor Kulikov
10777861a0 Set version 2019-12-23 18:31:44 +02:00
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