611 Commits

Author SHA1 Message Date
Volodymyr Babak
b91bfddf18 Separate controller and mqtt suite 2017-06-22 21:22:08 +03:00
Igor Kulikov
13a6c9a142 Merge pull request #177 from thingsboard/feature/TB-64
TB-64: Widget actions
2017-06-22 17:45:23 +03:00
Igor Kulikov
2fdb372c89 TB-64: Implement widget actions. 2017-06-22 17:40:26 +03:00
Andrew Shvayka
dff1bfe209 Merge pull request #176 from volodymyr-babak/feature/fix-for-IE-redirect
Fixed IE issue with redirect. 308 return code doesn't work. 303 does.…
2017-06-22 16:43:24 +03:00
Volodymyr Babak
f69c31f077 Test fixed 2017-06-22 13:14:30 +03:00
Volodymyr Babak
4e45d24fd1 Fixed IE issue with redirect. 308 return code doesn't work. 303 does. All other browsers are verified agains 303 code as well. 2017-06-22 11:43:28 +03:00
Igor Kulikov
755b6d360f Merge branch 'master' into feature/TB-64 2017-06-21 19:54:41 +03:00
Igor Kulikov
849f53ca4c Fix: don't fetch name of deleted alarm originator. Add ability to create dynamic subscriptions for alarms. 2017-06-21 19:21:51 +03:00
Igor Kulikov
8e90c903bb TB-64: Implement widget actions table. 2017-06-21 13:43:49 +03:00
Volodymyr Babak
b88ce86638 Data annotation contains toString, equals and hashcode impls 2017-06-20 17:20:00 +03:00
Igor Kulikov
25af06f25d Dashboard lauout improvements. 2017-06-20 12:25:51 +03:00
Volodymyr Babak
3c47789a3f JPA Dao misc fixes due to test failures 2017-06-19 20:28:28 +03:00
Igor Kulikov
4e8c05f670 Merge pull request #175 from thingsboard/feature/TB-62
TB-62: Implement Entities table widget
2017-06-19 19:24:02 +03:00
Igor Kulikov
d69e98e8b9 TB-62: Implement Entities table widget 2017-06-19 19:22:48 +03:00
Volodymyr Babak
5ab6e886bc JPA Dao misc fixes due to test failures 2017-06-19 10:18:51 +03:00
Igor Kulikov
3ecf91c5be Merge pull request #173 from thingsboard/feature/TB-63
TB-63: Layout improvements.
2017-06-16 13:39:43 +03:00
Igor Kulikov
49141c5f54 TB-63: Layout improvements. 2017-06-16 13:39:00 +03:00
Volodymyr Babak
73d6eee4fc Moved ConditionalProperty for sql and nosql dao to new annotations 2017-06-16 12:43:12 +03:00
Igor Kulikov
0bfbbd95ec Merge pull request #172 from thingsboard/feature/TB-63
TB-63: Minor fixes.
2017-06-16 10:59:41 +03:00
Igor Kulikov
dcd1c27d28 TB-63: Minor fixes. 2017-06-16 10:58:47 +03:00
Volodymyr Babak
f806c392b2 Merge remote-tracking branch 'upstream/master' into dao-refactoring-vs 2017-06-15 21:43:17 +03:00
Volodymyr Babak
1141a26a17 Changed blobd type to json text
Added JPA support for service test
2017-06-15 21:42:52 +03:00
Igor Kulikov
c277b6a9f1 TB-63: Improve alarms widget. Find highest alarm severity for specified entity. 2017-06-15 20:15:34 +03:00
Igor Kulikov
87683218b5 TB-63: Find highest alarm severity for specified entity. 2017-06-15 20:13:47 +03:00
Igor Kulikov
69a0b74c6b TB-63: Improve alarms widget. Introduce auto-fill height setting for dashboard layout. 2017-06-15 18:29:28 +03:00
Igor Kulikov
09ca1caf96 Merge pull request #170 from thingsboard/feature/TB-63
TB-63: Improve alarm widget layout.
2017-06-15 13:46:07 +03:00
Igor Kulikov
8a37cf0d0d TB-63: Improve alarm widget layout. 2017-06-15 13:45:40 +03:00
Igor Kulikov
3ecae790df Merge pull request #169 from thingsboard/feature/TB-63
TB-63: Alarms widget implementation
2017-06-14 20:26:04 +03:00
Igor Kulikov
eda21c94ef TB-63: Alarms widget implementation 2017-06-14 20:23:13 +03:00
Volodymyr Babak
d6d2de6d9d Added ts kv latest and ts kv jps dao support 2017-06-14 19:27:35 +03:00
Igor Kulikov
6056af8e09 Merge pull request #168 from thingsboard/feature/TB-63
TB-63: Alarms widget initial implementation.
2017-06-14 13:44:01 +03:00
Igor Kulikov
531f42450f TB-63: Alarms widget initial implementation. 2017-06-14 13:43:18 +03:00
Volodymyr Babak
4486d07f6d Get rid of cassandra specific classes in timeseries dao and timeseries service interfaces 2017-06-14 11:58:45 +03:00
Volodymyr Babak
08f7e48f94 Fixed JPA alarm impl 2017-06-13 17:06:12 +03:00
Volodymyr Babak
4351c30adf Added attribute jpa dao 2017-06-13 16:29:40 +03:00
Volodymyr Babak
44c28b5b0f Merge remote-tracking branch 'upstream/master' into dao-refactoring-vs 2017-06-13 16:29:00 +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
Volodymyr Babak
df4f5f9ad9 fixed license headers 2017-06-12 10:06:09 +03:00
Volodymyr Babak
7458df8aab Merge remote-tracking branch 'upstream/master' into dao-refactoring-vs 2017-06-12 10:01:55 +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
Volodymyr Babak
0fa24abc24 Minor renaming and refactoring 2017-06-09 19:57:12 +03:00
Volodymyr Babak
2d146c2416 Added KV entity for postgres 2017-06-09 19:52:26 +03:00
Volodymyr Babak
79623fbd3d Refactored attributes dao 2017-06-09 19:07:30 +03:00