177 Commits

Author SHA1 Message Date
Igor Kulikov
517cf1323e Merge branch 'master' into feature/TB-65 2017-07-04 09:49:05 +03:00
Igor Kulikov
f8f7de7964 TB-65: Implement upgrade procedure. 2017-07-04 09:43:53 +03:00
Volodymyr Babak
b8b078e590 Fixed controller tests 2017-07-03 18:43:26 +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
90e0c44e7a Merge remote-tracking branch 'upstream/dao-refactoring-vs' into sql-dao-improvements 2017-07-03 16:00:42 +03:00
Volodymyr Babak
1f44628bf6 Merge remote-tracking branch 'upstream/master' into sql-dao-improvements 2017-07-03 15:59:55 +03:00
Igor Kulikov
5f9b9cb85d Merge pull request #195 from thingsboard/feature/TB-65
TB-65: Fix spring boot configuration.
2017-07-03 13:41:56 +03:00
Igor Kulikov
1cc21c2eca TB-65: Fix spring boot configuration. 2017-07-03 13:41:17 +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
2b8a8fb809 Added missing dependency 2017-07-01 20:49:12 +03:00
Volodymyr Babak
4f06c390ef Unifying SQL DAO 2017-07-01 20:39:00 +03:00
Igor Kulikov
62e9d3e1fd TB-65: Database schema installation service. 2017-06-30 18:49:24 +03:00
Igor Kulikov
e11dc50a7f Merge branch 'master' into feature/TB-65 2017-06-30 16:40:52 +03:00
mp-loki
e8d7675269 Application module postgres tests added 2017-06-29 22:30:35 -04:00
Igor Kulikov
5bffbf8708 TB-65: Merge with master. 2017-06-29 20:07:28 +03:00
Andrew Shvayka
4b67d428d7 Merge pull request #189 from volodymyr-babak/fix/device-name-type-cache-fix
Added deviceType and deviceName update.
2017-06-29 16:49:49 +03:00
Igor Kulikov
38c385f51a TB-65: ThingsBoard Install application/service. 2017-06-29 16:27:28 +03:00
Andrew Shvayka
30c0f42f86 Merge pull request #137 from volodymyr-babak/feature/mqtt-plugin
Added MQTT plugin
2017-06-29 15:10:19 +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
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
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
b91bfddf18 Separate controller and mqtt suite 2017-06-22 21:22:08 +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
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
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
4486d07f6d Get rid of cassandra specific classes in timeseries dao and timeseries service interfaces 2017-06-14 11:58:45 +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
Igor Kulikov
9cdfe4ef54 TB-61: Implemented new alias filters. 2017-06-12 12:59:51 +03:00
Volodymyr Babak
7458df8aab Merge remote-tracking branch 'upstream/master' into dao-refactoring-vs 2017-06-12 10:01:55 +03:00
Andrew Shvayka
0bc4252f97 Fixed unit tests after TTL feature 2017-06-11 09:01:36 +03:00
Volodymyr Babak
0fa24abc24 Minor renaming and refactoring 2017-06-09 19:57:12 +03:00
Volodymyr Babak
79623fbd3d Refactored attributes dao 2017-06-09 19:07:30 +03:00
Volodymyr Babak
11a2844072 Merge remote-tracking branch 'upstream/master' into dao-refactoring-vs 2017-06-09 14:16:07 +03:00