1912 Commits

Author SHA1 Message Date
Andrew Shvayka
a6c92bfbde Merge remote-tracking branch 'origin/master' into develop/2.2-transports 2018-10-04 16:36:53 +03:00
Andrew Shvayka
bc591ce09f tmp commit to merge with master 2018-10-04 16:36:46 +03:00
Igor Kulikov
626063dfb5 Version set to 2.1.1 2018-10-04 16:32:37 +03:00
Igor Kulikov
03a2d3e0e4
Merge pull request #1115 from thingsboard/lonwern-gateway-rpc-suback
Lonwern gateway rpc suback
2018-10-04 16:07:22 +03:00
Igor Kulikov
59187a120f Gateway RPC Sub ACK 2018-10-04 16:06:41 +03:00
Igor Kulikov
1f80e8db56
Merge pull request #1114 from ShvaykaD/feature/mqtt-sub-qos
Mqtt Sub QoS
2018-10-04 16:00:18 +03:00
Igor Kulikov
4122560f1f
Merge pull request #1113 from Terny22/bug/action-buttons-layout
UI:Fix. Action buttons overlay action buttons from right layout in mobile view
2018-10-04 14:52:43 +03:00
Igor Kulikov
23a596bbd4
Merge pull request #1106 from Terny22/widget-basic-settings
fixed units and decimals settings in some widgets
2018-10-04 14:50:55 +03:00
Sergey Tarnavskiy
bd536e5881 Action buttons overlay action buttons from right layout in mobile view 2018-10-04 14:48:01 +03:00
Igor Kulikov
c16ab58806
Merge pull request #1023 from Sioxas/bugfix/modify-action-source
Fix #1022
2018-10-04 14:45:06 +03:00
Igor Kulikov
175b04754c
Merge pull request #1074 from tagliala/add-autoprefixer
Add autoprefixer
2018-10-04 14:26:36 +03:00
Igor Kulikov
1c0c78b4ff Merge branch 'master' of github.com:thingsboard/thingsboard 2018-10-04 14:18:16 +03:00
Igor Kulikov
1327913679 Add default bar width option for Bars chart 2018-10-04 14:18:03 +03:00
VoBa
ae13a5a370
Merge pull request #1110 from thingsboard/typo-fix
Fixed exception msg
2018-10-04 11:38:51 +03:00
Volodymyr Babak
e54eb2a606 Fixed exception msg 2018-10-03 21:28:37 +03:00
VoBa
e8620d866e
Merge pull request #1109 from thingsboard/typo-fix
typo-fix
2018-10-03 20:13:13 +03:00
Volodymyr Babak
79203bc2a9 Enabled audit log for entity view 2018-10-03 19:33:19 +03:00
Igor Kulikov
f7f6045800 Merge with master 2018-10-03 19:20:47 +03:00
Volodymyr Babak
286b296f44 typo-fix 2018-10-03 19:03:42 +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
Sergey Tarnavskiy
ac1de4d12e fixed units and decimals settings in cards-bundle 2018-10-01 13:48:01 +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
lonwern
aa89c1a544 Add SUB ACK on topic v1/gateway/rpc 2018-09-29 09:57:40 +08: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