182 Commits

Author SHA1 Message Date
VoBa
90077a7cc8 Merge pull request #199 from volodymyr-babak/master
Moved hsql DB folder to env variables
2017-07-05 15:13:45 +03:00
Igor Kulikov
2ce15d5f6f Fix widgets bundle and widget type alias creation. 2017-07-05 14:12:20 +03:00
Volodymyr Babak
328a3ed315 Disabled jpa tests temporary 2017-07-05 13:16:55 +03:00
Volodymyr Babak
ebbec80164 Merge branch 'master' of github.com:thingsboard/thingsboard 2017-07-05 11:17:18 +03:00
volodymyr-babak
94bd7e0cc2 Fixed dao service tests 2017-07-04 18:58:23 +03:00
Volodymyr Babak
bdb3d3db25 Fixes for JPA DAO tests 2017-07-04 14:46:54 +03:00
Igor Kulikov
517cf1323e Merge branch 'master' into feature/TB-65 2017-07-04 09:49:05 +03:00
Volodymyr Babak
51620220d3 Fixed hsqldb tests 2017-07-04 09:46:10 +03:00
Igor Kulikov
f8f7de7964 TB-65: Implement upgrade procedure. 2017-07-04 09:43:53 +03:00
Volodymyr Babak
62caeefbf1 Merge remote-tracking branch 'upstream/master' into sql-dao-improvements 2017-07-03 18:31:32 +03:00
Volodymyr Babak
1f44628bf6 Merge remote-tracking branch 'upstream/master' into sql-dao-improvements 2017-07-03 15:59:55 +03:00
Andrew Shvayka
47f44d54cf Merge pull request #193 from thingsboard/feature/TB-69
TB-69: Implementation
2017-07-03 13:39:51 +03:00
Andrew Shvayka
2deeecdfba License file fixes 2017-07-03 12:46:13 +03:00
Igor Kulikov
19408e1cee Merge branch 'master' into feature/TB-65 2017-07-03 12:45:51 +03:00
Igor Kulikov
b2ac8f6447 Add missing getRelation method. 2017-07-03 12:45:27 +03:00
Volodymyr Babak
3c3a4e4c74 Fixed device api sql test 2017-07-03 11:34:11 +03:00
Andrew Shvayka
36e4bba040 TB-69: Implementation 2017-07-03 10:22:29 +03:00
Volodymyr Babak
ea5f4d78f0 Fixed device api sql test 2017-07-03 09:36:27 +03:00
Volodymyr Babak
4f06c390ef Unifying SQL DAO 2017-07-01 20:39:00 +03:00
Igor Kulikov
e11dc50a7f Merge branch 'master' into feature/TB-65 2017-06-30 16:40:52 +03:00
Igor Kulikov
5bffbf8708 TB-65: Merge with master. 2017-06-29 20:07:28 +03:00
Igor Kulikov
38c385f51a TB-65: ThingsBoard Install application/service. 2017-06-29 16:27:28 +03:00
Volodymyr Babak
47361b0166 Code review fixes 2017-06-29 15:55:05 +03:00
Volodymyr Babak
52d53c952e Fixed nullpointerexception 2017-06-29 12:22:37 +03:00
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
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
bdb6d2589b SystemTestSuite split to Sql and NoSql. Dao Test annotations renamed 2017-06-27 20:23:57 -04: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
mp-loki
f6e7668eba JPA Dao tests fixed 2017-06-26 21:18:31 -04: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
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
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
Volodymyr Babak
b88ce86638 Data annotation contains toString, equals and hashcode impls 2017-06-20 17:20:00 +03:00
Volodymyr Babak
3c47789a3f JPA Dao misc fixes due to test failures 2017-06-19 20:28:28 +03:00
Volodymyr Babak
5ab6e886bc JPA Dao misc fixes due to test failures 2017-06-19 10:18:51 +03:00
Volodymyr Babak
73d6eee4fc Moved ConditionalProperty for sql and nosql dao to new annotations 2017-06-16 12:43:12 +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
87683218b5 TB-63: Find highest alarm severity for specified entity. 2017-06-15 20:13:47 +03:00
Volodymyr Babak
d6d2de6d9d Added ts kv latest and ts kv jps dao support 2017-06-14 19:27:35 +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
3e0ef11678 TB-63: Add new 'Alarms' tab in entity details. 2017-06-13 12:33:34 +03:00
Igor Kulikov
351684a6cd TB-63: Update Alarms search query with AlarmSearchStatus parameter. 2017-06-12 18:30:46 +03:00