2756 Commits

Author SHA1 Message Date
Igor Kulikov
1b469df40c Fix permissions for Rules and Plugins details 2017-06-08 12:20:41 +03:00
Volodymyr Babak
cb41480be7 Added findRelations impl. Minor fixes 2017-06-08 10:55:31 +03:00
Igor Kulikov
75351e356a TB-61: Update import/export 2017-06-08 09:24:11 +03:00
Valerii Sosliuk
9f16c08401 Merge pull request #158 from volodymyr-babak/dao-refactoring-vs
Refactored first and next dao methods
2017-06-07 20:09:07 -04:00
Volodymyr Babak
29ae5b504c Fixed repository parent 2017-06-07 20:14:16 +03:00
Volodymyr Babak
3534684588 Refactored first and next dao methods
Fixed NULL_UUID
Added support for running cassandra and postgres application versions
2017-06-07 20:11:41 +03:00
Volodymyr Babak
776737519d Merge remote-tracking branch 'upstream/master' into dao-refactoring-vs 2017-06-07 19:42:57 +03:00
Andrew Shvayka
ec39c15e37 Merge branch 'master' of github.com:thingsboard/thingsboard 2017-06-07 19:19:51 +03:00
Andrew Shvayka
b8b27ec3f2 Extra logging and gateway fix 2017-06-07 19:19:43 +03:00
Igor Kulikov
c06d15745d Merge branch 'master' into feature/TB-61 2017-06-07 18:06:38 +03:00
Igor Kulikov
8d7fe5059c UI: Fix dashboard layout. 2017-06-07 17:54:00 +03:00
Igor Kulikov
0c0b3dade4 TB-61: Improve Alias Filter. Miltiple datasources resolution. 2017-06-07 17:09:04 +03:00
Igor Kulikov
ae4148d7fa UI: Fix: Call latest values update with empty data 2017-06-05 16:15:11 +03:00
Volodymyr Babak
2349af5d42 fixed license headers 2017-06-05 12:10:29 +03:00
Volodymyr Babak
b30f5e3871 Merge remote-tracking branch 'origin/feature/mqtt-plugin' into feature/mqtt-plugin 2017-06-05 11:58:29 +03:00
Volodymyr Babak
9f38981b9d Merge remote-tracking branch 'upstream/master' into feature/mqtt-plugin 2017-06-05 11:57:57 +03:00
Igor Kulikov
4054d3de6e UI: Improve dashboard state management. 2017-06-02 19:29:40 +03:00
volodymyr-babak
b33d0e78be Added Jpa Relation and Device Dao implementations 2017-06-02 19:05:54 +03:00
volodymyr-babak
613ebc9065 Fixed header and tests 2017-06-01 16:50:37 +03:00
volodymyr-babak
03f0bf5865 Added jpadevicedao implementations 2017-06-01 15:29:32 +03:00
volodymyr-babak
0ce99115cf Fixed entity save and fixed system widgets retrieve 2017-06-01 10:05:55 +03:00
volodymyr-babak
5f92fd29d2 Fixed default values for demo and system creation 2017-05-31 18:57:54 +03:00
volodymyr-babak
533a5d004d Added system and demo data
Added docker file for postgres db  schema
2017-05-31 18:55:59 +03:00
volodymyr-babak
0e31cd4cb4 Added postgres docker contrainer
Fixed build to run with sql enabled true
2017-05-31 12:48:35 +03:00
Igor Kulikov
3ebd99ac9e Merge branch 'master' of github.com:thingsboard/thingsboard 2017-05-31 11:32:14 +03:00
Igor Kulikov
438c3e67ec UI: Add alarm service. 2017-05-31 11:31:58 +03:00
volodymyr-babak
7d514d8cad Fixed js builds
Disabled autoconfiguration for hibernate
2017-05-30 21:02:14 +03:00
volodymyr-babak
6a62b64953 Fixed controller tests 2017-05-30 20:37:53 +03:00
volodymyr-babak
4c262d57c8 Merge remote-tracking branch 'upstream/master' into dao-refactoring-vs 2017-05-30 19:48:13 +03:00
VoBa
d2b7850d49 Merge pull request #154 from volodymyr-babak/master
Fixed cassandra image for kubernetes cluster
2017-05-30 19:47:48 +03:00
volodymyr-babak
2f79950178 Merge remote-tracking branch 'upstream/master' into dao-refactoring-vs 2017-05-30 19:45:58 +03:00
volodymyr-babak
4af67822a1 Fixed dao could not find class exception during tests and added license header 2017-05-30 17:04:16 +03:00
volodymyr-babak
5e2393eeda Fixed cassandra image for kubernetes cluster
Added latest version into Makefile script
2017-05-30 16:54:38 +03:00
volodymyr-babak
f7bbe2136b Fixed cache functionality. Moved annotation from interface to classes because of Spring bug https://jira.spring.io/browse/SPR-15271 2017-05-30 13:42:28 +03:00
Andrew Shvayka
410d197a34 Fixed Implementation of DAO and services after merge 2017-05-30 13:14:51 +03:00
volodymyr-babak
d1dad3c09a Added config parameter for tests to enable cassandra 2017-05-30 11:54:59 +03:00
Igor Kulikov
ecb5c50d61 UI: Implement Entity relations management. 2017-05-30 10:53:50 +03:00
volodymyr-babak
1b36cfb4fe Merge remote-tracking branch 'upstream/dao-refactoring-vs' into dao-refactoring-vs 2017-05-30 09:30:43 +03:00
volodymyr-babak
9ff29986bf Merge remote-tracking branch 'upstream/dao-refactoring' into dao-refactoring-vs 2017-05-30 09:30:39 +03:00
mp-loki
3c5b76b25d Added method implementations to missing JPA Asset and Alalrm DAO methods 2017-05-29 23:47:45 -04:00
Andrew Shvayka
9772c38902 Merge with master 2017-05-29 23:08:31 +03:00
Igor Kulikov
3c43d039e8 Add relationTypeGroup to relation column family. 2017-05-29 17:50:33 +03:00
volodymyr-babak
e9267f7101 Merge branch 'master' into feature/mqtt-plugin 2017-05-29 12:53:21 +03:00
Andrew Shvayka
6b446023b1 Merge pull request #151 from thingsboard/asset-alarm-mgmt
Asset & Alarm management
2017-05-29 12:22:14 +03:00
Andrew Shvayka
9f3de06547 Merge with master 2017-05-29 12:21:24 +03:00
volodymyr-babak
24d02763fb Updated parent version 2017-05-29 12:08:17 +03:00
volodymyr-babak
bdc048c548 Merge remote-tracking branch 'upstream/master' into feature/mqtt-plugin 2017-05-29 12:06:31 +03:00
Igor Kulikov
e3976b319d Merge branch 'master' of github.com:thingsboard/thingsboard 2017-05-29 11:48:01 +03:00
Igor Kulikov
a708509aac Entity relations management. 2017-05-29 11:47:43 +03:00
Andrew Shvayka
d6ad8c9e55 Merge with master 2017-05-29 11:05:35 +03:00