407 Commits

Author SHA1 Message Date
Igor Kulikov
eda21c94ef TB-63: Alarms widget implementation 2017-06-14 20:23:13 +03:00
Igor Kulikov
531f42450f TB-63: Alarms widget initial implementation. 2017-06-14 13:43:18 +03:00
Igor Kulikov
0726fbb546 Merge pull request #167 from thingsboard/feature/TB-63
TB-63: Add new 'Alarms' tab in entity details.
2017-06-13 12:36:29 +03:00
Igor Kulikov
3e0ef11678 TB-63: Add new 'Alarms' tab in entity details. 2017-06-13 12:33:34 +03:00
Igor Kulikov
f17f502cd2 Merge pull request #165 from thingsboard/feature/TB-63
TB-63: Update Alarms search query with AlarmSearchStatus parameter.
2017-06-12 18:31:43 +03:00
Igor Kulikov
351684a6cd TB-63: Update Alarms search query with AlarmSearchStatus parameter. 2017-06-12 18:30:46 +03:00
Igor Kulikov
2cb71c15b2 Merge pull request #164 from thingsboard/feature/TB-61
TB-61: Improve Alias Filter
2017-06-12 13:01:51 +03:00
Igor Kulikov
9cdfe4ef54 TB-61: Implemented new alias filters. 2017-06-12 12:59:51 +03:00
Igor Kulikov
a90f16f4f7 Merge branch 'master' into feature/TB-61 2017-06-11 13:54:25 +03:00
Andrew Shvayka
0bc4252f97 Fixed unit tests after TTL feature 2017-06-11 09:01:36 +03:00
Igor Kulikov
9ef646765e TB-61: Improve Aliases management. Implement Asset type and Device type alias filter. 2017-06-09 20:26:19 +03:00
Igor Kulikov
0a83091a72 Merge branch 'master' into feature/TB-61 2017-06-09 09:28:10 +03:00
Igor Kulikov
43b23cef4f TB-61: Improve Alias list editor. 2017-06-08 21:15:47 +03:00
Andrew Shvayka
89e9d27baf TTL Rule Implementation 2017-06-08 21:13:57 +03:00
Igor Kulikov
0a82a8309e Merge branch 'master' into feature/TB-61 2017-06-08 12:38:09 +03:00
Igor Kulikov
1b469df40c Fix permissions for Rules and Plugins details 2017-06-08 12:20:41 +03:00
Igor Kulikov
75351e356a TB-61: Update import/export 2017-06-08 09:24:11 +03:00
Andrew Shvayka
ec39c15e37 Merge branch 'master' of github.com:thingsboard/thingsboard 2017-06-07 19:19:51 +03:00
Andrew Shvayka
b8b27ec3f2 Extra logging and gateway fix 2017-06-07 19:19:43 +03:00
Igor Kulikov
c06d15745d Merge branch 'master' into feature/TB-61 2017-06-07 18:06:38 +03:00
Igor Kulikov
8d7fe5059c UI: Fix dashboard layout. 2017-06-07 17:54:00 +03:00
Igor Kulikov
0c0b3dade4 TB-61: Improve Alias Filter. Miltiple datasources resolution. 2017-06-07 17:09:04 +03:00
Igor Kulikov
ae4148d7fa UI: Fix: Call latest values update with empty data 2017-06-05 16:15:11 +03:00
Igor Kulikov
4054d3de6e UI: Improve dashboard state management. 2017-06-02 19:29:40 +03:00
Igor Kulikov
3ebd99ac9e Merge branch 'master' of github.com:thingsboard/thingsboard 2017-05-31 11:32:14 +03:00
Igor Kulikov
438c3e67ec UI: Add alarm service. 2017-05-31 11:31:58 +03:00
VoBa
d2b7850d49 Merge pull request #154 from volodymyr-babak/master
Fixed cassandra image for kubernetes cluster
2017-05-30 19:47:48 +03:00
volodymyr-babak
5e2393eeda Fixed cassandra image for kubernetes cluster
Added latest version into Makefile script
2017-05-30 16:54:38 +03:00
Igor Kulikov
ecb5c50d61 UI: Implement Entity relations management. 2017-05-30 10:53:50 +03:00
Igor Kulikov
3c43d039e8 Add relationTypeGroup to relation column family. 2017-05-29 17:50:33 +03:00
Andrew Shvayka
6b446023b1 Merge pull request #151 from thingsboard/asset-alarm-mgmt
Asset & Alarm management
2017-05-29 12:22:14 +03:00
Andrew Shvayka
9f3de06547 Merge with master 2017-05-29 12:21:24 +03:00
Igor Kulikov
e3976b319d Merge branch 'master' of github.com:thingsboard/thingsboard 2017-05-29 11:48:01 +03:00
Igor Kulikov
a708509aac Entity relations management. 2017-05-29 11:47:43 +03:00
Andrew Shvayka
d6ad8c9e55 Merge with master 2017-05-29 11:05:35 +03:00
Andrew Shvayka
1193539119 Merge pull request #145 from volodymyr-babak/feature/kubernetes
Kubernetes scripts
2017-05-29 10:54:34 +03:00
volodymyr-babak
2e618ee674 Revert changes for the config parameters 2017-05-29 10:33:33 +03:00
Igor Kulikov
90ef91e3a1 UI: Implement Asset/Device type management. 2017-05-28 18:23:05 +03:00
Igor Kulikov
a741a59ead Implement Assets/Devices type search functionality. 2017-05-26 17:12:57 +03:00
Igor Kulikov
ffc7a57e59 UI: Improve dashboard toolbar. Implement entity copy function. 2017-05-25 15:52:28 +03:00
Volodymyr Babak
8e4d704b84 Fixed cassandra labels 2017-05-25 14:11:13 +03:00
Andrew Shvayka
2435ca5d0f Merge remote-tracking branch 'origin/master' into asset-alarm-mgmt 2017-05-25 13:46:45 +03:00
Volodymyr Babak
1f5aa83006 Updates to proper namings 2017-05-25 12:49:19 +03:00
Volodymyr Babak
9a6d984441 Fixed cassandra schema instance name 2017-05-24 16:49:27 +03:00
Volodymyr Babak
d850f92c7b Fixed version 2017-05-24 16:40:19 +03:00
Igor Kulikov
34c6c30e06 UI: Implement different units support for different attrs/series. Multi-axis support for flot charts. 2017-05-24 16:37:34 +03:00
Volodymyr Babak
8ed9cf8620 Removed cassandra custom image 2017-05-24 16:37:20 +03:00
Volodymyr Babak
868f5d3ca1 Renaming + refactoring 2017-05-24 16:17:23 +03:00
VoBa
08e5feea9c Merge pull request #4 from volodymyr-babak/feature/docker-improve
Feature/docker improve
2017-05-24 15:35:14 +03:00
Volodymyr Babak
5690e4e848 Merge branch 'feature/kubernetes' into feature/docker-improve 2017-05-24 15:34:29 +03:00