679 Commits

Author SHA1 Message Date
Andrew Shvayka
ade282fdc1 Fixed license header 2017-08-10 17:09:56 +03:00
Andrew Shvayka
3c9b9808ac Merge branch 'master' of github.com:thingsboard/thingsboard 2017-08-10 17:04:22 +03:00
Andrew Shvayka
f555f007e6 Fix for alarm processor 2017-08-10 17:04:11 +03:00
Igor Kulikov
73f51659f6 Minor fixed for DAO layer. 2017-08-10 16:37:52 +03:00
Andrew Shvayka
a99bad1061 Merge branch 'master' of github.com:thingsboard/thingsboard 2017-08-09 17:46:34 +03:00
Andrew Shvayka
e51a04863a Refactoring of entity relations query 2017-08-09 17:46:04 +03:00
Igor Kulikov
859ab1ef9b UI: Improve entity state controller. 2017-08-08 18:13:49 +03:00
Igor Kulikov
87a2dba730 UI: Image Map - fix tooltip actions. 2017-08-08 16:52:55 +03:00
Igor Kulikov
86018bba01 UI: Improve digital gauge - horizontal bar. 2017-08-07 18:41:13 +03:00
Igor Kulikov
f5b42f098f Display timestamp option for digital gauges. 2017-08-07 18:02:21 +03:00
Igor Kulikov
ac3e4429b8 Improve device/asset types management. 2017-08-07 16:38:39 +03:00
Igor Kulikov
709280efed Merge pull request #236 from thingsboard/feature/TB-70
TB-70: Improve dashboard configuration. Add new alias type 'Single entity'.
2017-08-04 18:55:48 +03:00
Igor Kulikov
d236f62653 TB-70: Improve dashboard configuration. Add new alias type 'Single entity'. 2017-08-04 18:54:28 +03:00
Igor Kulikov
902bb8b91d Merge pull request #235 from thingsboard/feature/TB-70
TB-70: Image map - marker offset settings.
2017-08-04 15:07:29 +03:00
Igor Kulikov
71eda9ed0a TB-70: Image map - marker offset settings. 2017-08-04 15:06:48 +03:00
Igor Kulikov
a676cbf10c UI: Improve device/asset type autocomplete component. 2017-08-04 13:18:59 +03:00
Igor Kulikov
f130476f2f Merge pull request #234 from thingsboard/feature/TB-70
TB-70: Image map widget.
2017-08-03 19:21:03 +03:00
Igor Kulikov
26a7f69345 Merge branch 'master' into feature/TB-70 2017-08-03 19:19:57 +03:00
Igor Kulikov
2dcf8d6ca1 TB-70: Image map widget. 2017-08-03 19:19:22 +03:00
Andrew Shvayka
1f3c68d0d8 Merge pull request #230 from ssmaurya/master
Map widgets SSL issues #228
2017-08-03 13:12:26 +03:00
ssmaurya
3ed8d0e9c3 Delete ssl.patch 2017-08-02 21:40:18 +05:30
Shiv Shankar Maurya
fa2cf1ae10 SSL patch on map widgets 2017-08-02 21:37:04 +05:30
Andrew Shvayka
c0a8849784 Merge pull request #227 from volodymyr-babak/master
Docker updates for new release
2017-07-31 15:03:28 +03:00
Volodymyr Babak
5e9309eef6 Fixed version 2017-07-31 12:25:42 +03:00
Volodymyr Babak
f4a57256c1 Fixes for kubernetes cluster 2017-07-31 11:30:23 +03:00
volodymyr-babak
95954a30d3 Revert cassandra url 2017-07-31 08:27:45 +03:00
volodymyr-babak
cdf02c667b Merge branch 'master' of github.com:volodymyr-babak/thingsboard 2017-07-29 00:50:34 +03:00
Andrew Shvayka
14c5cf242c Fix to alarm state change during missing originator 2017-07-28 14:44:04 +03:00
Volodymyr Babak
be8f7062a4 Docker updates to new release features 2017-07-27 20:37:00 +03:00
Igor Kulikov
17825b2cb4 Merge pull request #224 from thingsboard/feature/TB-70
TB-70: Introduce default entity for alias state parameter. Add actio…
2017-07-26 20:28:09 +03:00
Igor Kulikov
b1a1c0bdf9 TB-70: Introduces default entity for alias state parameter. Add actions support for alarms table widget. 2017-07-26 20:26:39 +03:00
Andrew Shvayka
c003b20bbe Merge branch 'master' of github.com:thingsboard/thingsboard 2017-07-26 19:57:21 +03:00
Andrew Shvayka
8161956d9f Fix to the name of installed service 2017-07-26 19:57:09 +03:00
Igor Kulikov
1430fe27db Merge pull request #223 from thingsboard/feature/TB-70
TB-70: RPC widgets: improve led indicator widget behavior.
2017-07-26 16:29:27 +03:00
Igor Kulikov
10020e6f9d TB-70: RPC widgets: improve led indicator widget behaviour. 2017-07-26 16:27:50 +03:00
Volodymyr Babak
d1f9f25f29 Merge remote-tracking branch 'upstream/master' 2017-07-26 16:17:10 +03:00
Volodymyr Babak
49feb9132c Docker updates to new release features 2017-07-26 16:16:07 +03:00
Igor Kulikov
d77dd0f8fc Merge pull request #220 from thingsboard/feature/TB-70
TB-70: RPC Widgets: LED indicator.
2017-07-26 01:40:37 +03:00
Igor Kulikov
554e6a2db4 TB-70: RPC Widgets: LED indicator. 2017-07-26 01:39:58 +03:00
Igor Kulikov
b7c50950ad TB-70: RPC Widgets: LED indicator. 2017-07-26 01:38:07 +03:00
Igor Kulikov
6357544ce2 Merge pull request #219 from thingsboard/feature/TB-70
TB-70: RPC widgets: Add round switch control widget.
2017-07-25 14:04:55 +03:00
Igor Kulikov
ce48c4ac6a TB-70: RPC widgets: Add round switch control widget. 2017-07-25 14:03:28 +03:00
Andrew Shvayka
f87e5d66bf Merge pull request #218 from thingsboard/feature/TB-73
TB-73: Make Rule Action optional
2017-07-24 18:49:30 +03:00
Andrew Shvayka
2e019b52a6 TB-73: Implementation 2017-07-24 18:47:49 +03:00
Igor Kulikov
d9023482d9 TB-73: Make Rule plugin and action optional. Fix rule deletion. 2017-07-24 16:24:32 +03:00
Andrew Shvayka
ae4a71346f TB-73: Implementation 2017-07-24 15:14:01 +03:00
Igor Kulikov
e9730fec99 UI: minor improvements. 2017-07-24 13:52:29 +03:00
Andrew Shvayka
c3e62a7b16 Merge branch 'master' of github.com:thingsboard/thingsboard 2017-07-22 15:35:33 +03:00
Andrew Shvayka
4eb164f798 Fix for Windows installation and Alarm propagation 2017-07-22 15:04:05 +03:00
Igor Kulikov
67b5c5e2f0 Merge pull request #215 from thingsboard/feature/TB-72
TB-72: Add ability to edit JSON additional info of relations.
2017-07-21 18:54:16 +03:00