1683 Commits

Author SHA1 Message Date
Andrew Shvayka
bc591ce09f tmp commit to merge with master 2018-10-04 16:36:46 +03:00
Igor Kulikov
f7f6045800 Merge with master 2018-10-03 19:20:47 +03:00
Igor Kulikov
7d7d5cbdbc Merge branch 'master' into develop/2.2 2018-10-03 19:00:46 +03:00
Igor Kulikov
ee3d75bb4f MSA docker improvements. 2018-10-03 18:58:17 +03:00
VoBa
6475c696cc
Merge pull request #1108 from thingsboard/fix-for-delete
Fixes for cases when asset/device deleted but has entity view assigned
2018-10-03 18:54:41 +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
Igor Kulikov
8af8b27e7e Add tb-node docker image. Improve TB docker services. 2018-10-03 16:38:18 +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
Igor Kulikov
4bf57ebf20 ThingsBoard Web UI Microservice. 2018-10-02 17:42:09 +03:00
Igor Kulikov
52f04308d4 Improve JS Executor. Add docker build. 2018-10-02 11:50:55 +03:00
Volodymyr Babak
02895bf31d Typo fixed 2018-09-29 22:09:18 +03:00
VoBa
151cf2376f
Merge pull request #1072 from thingsboard/feature/entity-view
Feature/entity view
2018-09-29 21:44:51 +03:00
Volodymyr Babak
80f0d1eb8a Code review fixes 2018-09-29 11:33:24 +03:00
Volodymyr Babak
0b5f61338e Code review fixes 2018-09-29 11:32:02 +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
VoBa
5c6df92e1f
Merge pull request #1091 from thingsboard/feature/hybrid-db
Feature/hybrid db
2018-09-29 11:01:43 +03:00
viktorbasanets
d32a36c312 added test 2018-09-28 20:11:45 +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
Igor Kulikov
64b50fa8bc Remote Js Executor basic message processing. 2018-09-27 21:05:14 +03:00
viktorbasanets
5a65ec75fe Reviewed 2018-09-27 17:07:54 +03:00
Igor Kulikov
05e2981b36 Merge branch 'develop/2.2' of github.com:thingsboard/thingsboard into develop/2.2 2018-09-27 16:18:02 +03:00
Igor Kulikov
4a4e5ebecf JS Executor: Protobuf 2018-09-27 16:17:49 +03:00
Andrew Shvayka
9ef768f5e6 Fixed timeout logic 2018-09-27 14:50:24 +03:00
Andrew Shvayka
0271e2b8e9 Merge branch 'develop/2.2' of github.com:thingsboard/thingsboard into develop/2.2 2018-09-27 13:46:51 +03:00
Andrew Shvayka
029775e557 Fixes to Remote JS 2018-09-27 13:46:34 +03:00
viktorbasanets
87eb21d68f Were fixed caches 2018-09-27 13:11:06 +03:00
Igor Kulikov
316043afaa Merge branch 'develop/2.2' of github.com:thingsboard/thingsboard into develop/2.2 2018-09-27 12:16:00 +03:00
Igor Kulikov
b8c13535e4 Add Microservices module. Add ThingsBoard JS Executor Microservice. 2018-09-27 12:15:48 +03:00
Andrew Shvayka
4c4923e3f7 Timeout and Args support 2018-09-27 11:59:15 +03:00
Andrew Shvayka
c0668dcb52 Version set to 2.2.0-SNAPSHOT 2018-09-26 17:24:37 +03:00
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
43e45020e9 Merge branch 'master' of github.com:thingsboard/thingsboard 2018-09-26 14:57:53 +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
Andrew Shvayka
7adfdd0303
Merge pull request #1085 from Terny22/master
Fixed issue with gauge value changing on widget resize.
2018-09-26 11:50:45 +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
Andrew Shvayka
474dc16799
Merge pull request #1077 from chunyeow/master
add missing API limits on CoAP POST method
2018-09-23 10:36:17 +03:00