522 Commits

Author SHA1 Message Date
Volodymyr Babak
6e2bbe0241 Added deviceType and deviceName update.
Merged sql.enabled and cassandra.enabled into single property - database.type.
2017-06-29 11:11:20 +03:00
Andrew Shvayka
912cffc3b1 Merge pull request #183 from thingsboard/feature/TB-67
TB-67: Add new filter to rule engine based on device type
2017-06-28 12:58:29 +03:00
Andrew Shvayka
65e4739320 Merge pull request #152 from thingsboard/dao-refactoring-vs
Dao refactoring to support PostgreSQL
2017-06-28 12:49:02 +03:00
mp-loki
996658eb44 License Headers updated 2017-06-27 21:01:37 -04:00
mp-loki
bdb6d2589b SystemTestSuite split to Sql and NoSql. Dao Test annotations renamed 2017-06-27 20:23:57 -04:00
Volodymyr Babak
0c2342239d Changed default folder for docker containers 2017-06-27 16:51:15 +03:00
Volodymyr Babak
e559107704 Merge remote-tracking branch 'upstream/dao-refactoring-vs' into dao-refactoring-vs 2017-06-27 14:22:11 +03:00
Volodymyr Babak
ca8eaf70fc Splitted nosql and sql suites 2017-06-27 14:21:58 +03:00
Andrew Shvayka
b603f26fe9 TB-67: Implementation 2017-06-27 14:17:06 +03:00
mp-loki
f6e7668eba JPA Dao tests fixed 2017-06-26 21:18:31 -04:00
Andrew Shvayka
c89a4e8d33 TB-67: Implementation 2017-06-26 19:22:13 +03:00
Volodymyr Babak
1983235b3f Test fixed. Moving classes into new packages 2017-06-26 19:19:17 +03:00
Volodymyr Babak
09858d6515 Fixed entityType mapping 2017-06-26 10:20:48 +03:00
Andrew Shvayka
1a6826c07c Merge pull request #180 from thingsboard/feature/TB-66
TB-66: Add support of device type mapping in the IoT Gateway
2017-06-26 09:36:30 +03:00
Andrew Shvayka
859c1f8e9d TB-66: Implementation 2017-06-25 15:11:00 +03:00
mp-loki
6048b45e39 Embedded Postgresql test unit added 2017-06-24 13:29:43 -04:00
Volodymyr Babak
5935de07b3 Added get ts async implementation 2017-06-23 19:49:58 +03:00
Volodymyr Babak
6206d5fcb2 Native-query changed to JPA 2017-06-23 18:20:24 +03:00
Igor Kulikov
f93dc9058f UI: Dashboard layout improvements. 2017-06-23 12:59:10 +03:00
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