822 Commits

Author SHA1 Message Date
volodymyr-babak
09c89bc42c Merge remote-tracking branch 'upstream/master' 2017-07-04 18:48:22 +03:00
Igor Kulikov
2441cc0ee9 UI: Minor updates. 2017-07-04 17:49:05 +03:00
Volodymyr Babak
bdb3d3db25 Fixes for JPA DAO tests 2017-07-04 14:46:54 +03:00
Igor Kulikov
2eef2c0253 Merge pull request #196 from thingsboard/feature/TB-65
TB-65: Unix install/upgrade scripts.
2017-07-04 13:48:11 +03:00
Igor Kulikov
f206b9f4e7 TB-65: Unix install/upgrade scripts. 2017-07-04 13:44:57 +03:00
Volodymyr Babak
467c85bf9f Merge remote-tracking branch 'upstream/master' 2017-07-04 09:54:02 +03:00
Igor Kulikov
517cf1323e Merge branch 'master' into feature/TB-65 2017-07-04 09:49:05 +03:00
VoBa
f274c72f14 Merge pull request #192 from volodymyr-babak/sql-dao-improvements
Unifying SQL DAO
2017-07-04 09:47:01 +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
086cd13cd9 Increased memory for maven builds 2017-07-03 19:35:21 +03:00
Volodymyr Babak
b7a9f82a0c Increased memory for maven builds 2017-07-03 19:34:55 +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
Volodymyr Babak
aa48c5493c Merge remote-tracking branch 'upstream/master' 2017-07-03 13:31:43 +03:00
Igor Kulikov
e972ec65dc Merge pull request #194 from thingsboard/feature/TB-65
TB-65: ThingsBoard Install application/service.
2017-07-03 12:48:40 +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
Igor Kulikov
8e272b0162 UI: Minor fixes 2017-06-30 16:35:03 +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
Volodymyr Babak
47361b0166 Code review fixes 2017-06-29 15:55:05 +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
611995121b Code review fixes 2017-06-29 15:06:14 +03:00
Volodymyr Babak
8abb57387c Increased maven max memory 2017-06-29 14:55:39 +03:00
Volodymyr Babak
acbe5e7378 Added mvn memory limits 2017-06-29 14:23:48 +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
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