635 Commits

Author SHA1 Message Date
Igor Kulikov
8c5d06cdb5 Merge with develop/2.1.2 2018-10-10 12:16:16 +03:00
Volodymyr Babak
94cb347899 Added entity view type 2018-10-09 18:51:10 +03:00
Igor Kulikov
6b4a2ff166 Version set to 2.1.2-SNAPSHOT 2018-10-09 12:18:37 +03:00
Igor Kulikov
d92b06584a Merge branch 'master' into develop/2.2 2018-10-04 17:20:33 +03:00
Igor Kulikov
626063dfb5 Version set to 2.1.1 2018-10-04 16:32:37 +03:00
Volodymyr Babak
e54eb2a606 Fixed exception msg 2018-10-03 21:28:37 +03:00
Igor Kulikov
7d7d5cbdbc Merge branch 'master' into develop/2.2 2018-10-03 19:00:46 +03:00
Volodymyr Babak
aa79557841 Fixes for cases when asset/device deleted but has entity view assigned 2018-10-03 17:43:29 +03:00
Volodymyr Babak
b1f9ffb3b8 Fixes for cases when asset/device deleted but has entity view assigned 2018-10-03 13:12:23 +03:00
Volodymyr Babak
321d4f1cb2 Fixes for cases when asset/device deleted but has entity view assigned 2018-10-03 13:08:50 +03:00
Volodymyr Babak
78b40b097a Fixes for cases when asset/device deleted but has entity view assigned 2018-10-03 12:42:28 +03:00
Volodymyr Babak
ca62616ccc Fixes for cases when asset/device deleted but has entity view assigned 2018-10-03 11:26:36 +03:00
Volodymyr Babak
80f0d1eb8a Code review fixes 2018-09-29 11:33:24 +03:00
Volodymyr Babak
9071f58e70 Merge remote-tracking branch 'origin/master' into feature/entity-view 2018-09-29 11:30:26 +03:00
Volodymyr Babak
48bae4b2b4 Code review fixes 2018-09-29 11:30:07 +03:00
VoBa
b0321157e0
Merge pull request #1102 from ViktorBasanets/entity-view
Entity view next
2018-09-29 11:05:17 +03:00
viktorbasanets
49a9867352 After review 2018-09-28 17:56:32 +03:00
Volodymyr Babak
673c2b2e95 Merge remote-tracking branch 'origin/master' into feature/hybrid-db 2018-09-28 17:50:00 +03:00
Volodymyr Babak
a1aff91c09 Merge remote-tracking branch 'origin/master' into feature/entity-view 2018-09-28 17:49:38 +03:00
viktorbasanets
5a65ec75fe Reviewed 2018-09-27 17:07:54 +03:00
viktorbasanets
87eb21d68f Were fixed caches 2018-09-27 13:11:06 +03:00
Andrew Shvayka
c0668dcb52 Version set to 2.2.0-SNAPSHOT 2018-09-26 17:24:37 +03:00
viktorbasanets
7bcb64958d Fixed 2018-09-26 11:43:15 +03:00
viktorbasanets
2269656b09 Were fixed 2018-09-25 18:57:04 +03:00
viktorbasanets
56397e0d90 Added several checks for equality to null 2018-09-21 17:37:04 +03:00
Volodymyr Babak
2adb39ba6c code review fixes 2018-09-20 16:03:44 +03:00
VoBa
92b78a5413
Merge pull request #1039 from hagaic/hybrid-db
Hybrid db - install schemas
2018-09-20 14:27:19 +03:00
Volodymyr Babak
b40b8c8e9f Code review fixes 2018-09-18 23:00:27 +03:00
viktorbasanets
1e6bd55130 Was fixed Materialized View 2018-09-18 15:33:37 +03:00
viktorbasanets
d3ba64683c Were added all necessary methods 2018-09-17 19:56:17 +03:00
viktorbasanets
77de5522af Were fixed materialized views 2018-09-17 19:54:34 +03:00
viktorbasanets
825d7094b3 Was cleared of unnecessary 2018-09-17 17:31:59 +03:00
viktorbasanets
7bfccc0f8b Was fixed cache to pass tests 2018-09-17 17:27:37 +03:00
viktorbasanets
06d59ed62a Was added new rule node 2018-09-14 15:35:02 +03:00
Volodymyr Babak
020b7a4ec6 Added copy attributes to entity view rule node 2018-09-14 14:04:12 +03:00
viktorbasanets
74bfd4c7b4 fixed cache after merge with upstream/feature/entity-view brance 2018-09-12 19:45:57 +03:00
viktorbasanets
9a77b2b199 Was fixed the cache 2018-09-12 18:43:42 +03:00
Volodymyr Babak
0b379d6b6a Fixes for telemetry service subscription 2018-09-12 15:51:18 +03:00
Volodymyr Babak
63395fc8e5 Added attribute copying on entity view creation 2018-09-12 12:56:35 +03:00
Volodymyr Babak
5dc541eabf Misc fixes 2018-09-12 09:34:43 +03:00
Volodymyr Babak
09e90b3089 Code review fixes 2018-09-12 09:08:30 +03:00
Dima Landiak
01e06fcd34 jpa orderBy fix 2018-09-11 18:11:04 +03:00
viktorbasanets
5172135222 Merge remote-tracking branch 'upstream/feature/entity-view' 2018-09-11 18:06:11 +03:00
viktorbasanets
20e3dc254b To repair the cache 2018-09-11 17:21:11 +03:00
viktorbasanets
770253a32c Was fixed the type of startTs & endTs fields of EntityViewEntity class and queries of schemas db tables 2018-09-11 15:59:00 +03:00
viktorbasanets
1e1beaaeac Was modified findLatest(...) method & BaseTimeseriesService(...) constructor for set limit and order by values 2018-09-11 15:13:45 +03:00
Volodymyr Babak
5c31884c68 Fixed dao for customer 2018-09-11 13:22:34 +03:00
viktorbasanets
b02503a455 Conflicts resolved 2018-09-11 12:43:27 +03:00
Volodymyr Babak
d909192071 Merge remote-tracking branch 'origin/master' into feature/entity-view 2018-09-10 19:50:47 +03:00
Dima Landiak
29fc238676 refactoring and changing class names 2018-09-10 19:32:04 +03:00