8366 Commits

Author SHA1 Message Date
Andrew Shvayka
bd1ef13a5d Merge branch 'master' of github.com:thingsboard/thingsboard into feature/external-js-eval 2018-09-26 17:22:02 +03:00
Andrew Shvayka
7ba82aef3b Fixes to configuration 2018-09-26 17:21:18 +03:00
Andrew Shvayka
601efbc931 Fixed action type for alarm audit log 2018-09-26 14:57:43 +03:00
Andrew Shvayka
2ada821d6c Implementation draft 2018-09-26 14:54:59 +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
Andrew Shvayka
175e73256d Refactoring 2018-09-24 19:20:55 +03:00
viktorbasanets
4489440ae3 Were renamed variables 2018-09-24 14:55:49 +03:00
Andrew Shvayka
6c618a7db3 Fixed issue with Zookeeper reconnect 2018-09-23 16:22:04 +03:00
Andrew Shvayka
99694c99c3 Initial refactoring 2018-09-23 16:11:09 +03:00
viktorbasanets
584bb763ca Fixed annotations @Test 2018-09-21 18:23:31 +03:00
viktorbasanets
b45662c630 Added test for checking the copy attributes 2018-09-21 17:38:23 +03:00
Volodymyr Babak
014ed4f979 Fixed tests 2018-09-20 17:08:03 +03:00
Volodymyr Babak
2adb39ba6c code review fixes 2018-09-20 16:03:44 +03:00
Volodymyr Babak
8d7a27c49c Added check for keys 2018-09-19 10:44:29 +03:00
Volodymyr Babak
b40b8c8e9f Code review fixes 2018-09-18 23:00:27 +03:00
Volodymyr Babak
531a16cd12 Fixes for subscription 2018-09-18 22:21:39 +03:00
Volodymyr Babak
4182a70d5f Fixes for subscription 2018-09-18 19:42:14 +03:00
viktorbasanets
1e6bd55130 Was fixed Materialized View 2018-09-18 15:33:37 +03:00
viktorbasanets
77de5522af Were fixed materialized views 2018-09-17 19:54:34 +03:00
viktorbasanets
9237a5dda9 Was deleted unnecessesary lines 2018-09-17 17:43:42 +03:00
viktorbasanets
72f0d90c90 Was fixed the last tests 2018-09-17 17:33:05 +03:00
viktorbasanets
06d59ed62a Was added new rule node 2018-09-14 15:35:02 +03:00
viktorbasanets
5180961ecb Was modified of request mapping values 2018-09-14 15:12:55 +03:00
Volodymyr Babak
020b7a4ec6 Added copy attributes to entity view rule node 2018-09-14 14:04:12 +03:00
viktorbasanets
7c14df56e3 Was added new tests 2018-09-13 19:51:40 +03:00
viktorbasanets
3fba214509 Was modified values of request mapping annotation 2018-09-13 19:50:49 +03:00
viktorbasanets
74bfd4c7b4 fixed cache after merge with upstream/feature/entity-view brance 2018-09-12 19:45:57 +03:00
viktorbasanets
8ca3e594e8 Was added field wich needed for caching 2018-09-12 18:24:45 +03:00
Volodymyr Babak
0b379d6b6a Fixes for telemetry service subscription 2018-09-12 15:51:18 +03:00
Volodymyr Babak
09e90b3089 Code review fixes 2018-09-12 09:08:30 +03:00
viktorbasanets
cb087d0b53 For testing of entiti-view controller 2018-09-11 17:18:51 +03:00
vparomskiy
b8975fed73 Merge branch 'master' of https://github.com/thingsboard/thingsboard 2018-09-11 16:33:46 +03:00
vparomskiy
5ea053b71b blacklisted Script error should show initial exception 2018-09-11 16:33:39 +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
vparomskiy
831f6201db sync deduplicated script evaluation/release 2018-09-11 14:36:24 +03:00
viktorbasanets
b02503a455 Conflicts resolved 2018-09-11 12:43:27 +03:00
viktorbasanets
0501e9d4b4 Was modified addLocalWsSubscription(...) 2018-09-10 19:53:29 +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
viktorbasanets
4e39ed53fe Minor changes 2018-09-10 19:09:12 +03:00
viktorbasanets
1adb36cd47 Was added the filds of start-time and end-time 2018-09-10 17:15:11 +03:00
Volodymyr Babak
06a0941dbe Entity view misc fixes 2018-09-10 14:37:46 +03:00
Volodymyr Babak
5bf9528ee8 Fixes for entity view 2018-09-10 11:11:07 +03:00
Dima Landiak
c1f3abf9de refactoring 2018-09-06 15:55:49 +03:00
viktorbasanets
61da5d5d6e Was addet to validate instance of entity-view 2018-09-06 14:19:35 +03:00
viktorbasanets
e132d702a2 Was changed path to all sql and nosql tests 2018-09-06 13:10:48 +03:00
viktorbasanets
c5827e1b9e was added entity_type field to entity_views table 2018-09-06 13:07:31 +03:00
Dima Landiak
753ff4e31a merged with master 2018-09-06 12:41:13 +03:00
viktorbasanets
d731bf614e commit3 2018-09-05 19:29:42 +03:00