672 Commits

Author SHA1 Message Date
Igor Kulikov
351684a6cd TB-63: Update Alarms search query with AlarmSearchStatus parameter. 2017-06-12 18:30:46 +03:00
Igor Kulikov
2cb71c15b2 Merge pull request #164 from thingsboard/feature/TB-61
TB-61: Improve Alias Filter
2017-06-12 13:01:51 +03:00
Igor Kulikov
9cdfe4ef54 TB-61: Implemented new alias filters. 2017-06-12 12:59:51 +03:00
Volodymyr Babak
df4f5f9ad9 fixed license headers 2017-06-12 10:06:09 +03:00
Volodymyr Babak
7458df8aab Merge remote-tracking branch 'upstream/master' into dao-refactoring-vs 2017-06-12 10:01:55 +03:00
Igor Kulikov
a90f16f4f7 Merge branch 'master' into feature/TB-61 2017-06-11 13:54:25 +03:00
Andrew Shvayka
0bc4252f97 Fixed unit tests after TTL feature 2017-06-11 09:01:36 +03:00
Igor Kulikov
9ef646765e TB-61: Improve Aliases management. Implement Asset type and Device type alias filter. 2017-06-09 20:26:19 +03:00
Volodymyr Babak
0fa24abc24 Minor renaming and refactoring 2017-06-09 19:57:12 +03:00
Volodymyr Babak
2d146c2416 Added KV entity for postgres 2017-06-09 19:52:26 +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
Igor Kulikov
0a83091a72 Merge branch 'master' into feature/TB-61 2017-06-09 09:28:10 +03:00
Igor Kulikov
43b23cef4f TB-61: Improve Alias list editor. 2017-06-08 21:15:47 +03:00
Andrew Shvayka
89e9d27baf TTL Rule Implementation 2017-06-08 21:13:57 +03:00
Igor Kulikov
0a82a8309e Merge branch 'master' into feature/TB-61 2017-06-08 12:38:09 +03:00
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