dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,677 Commits 106 Branches 71 Tags
Commit Graph

1243 Commits

Author SHA1 Message Date
Dmitriymush
fd3208cf82 2nd part of additions to fix after review 2020-12-23 17:14:19 +02:00
Viacheslav Kukhtyn
9829dd17cc Merge branch 'master' into feature/log-telemetry-updated 2020-12-23 16:16:15 +02:00
Igor Kulikov
45756dc728
Merge pull request #3834 from YevhenBondarenko/feature/keys-by-query 
added ability to get attributes and timeseries keys by entity query
 2020-12-23 16:13:39 +02:00
Volodymyr Babak
415959686f Added sync button. Added copy edge key and secret buttons 2020-12-22 20:12:04 +02:00
Volodymyr Babak
6e564de948 Moved edge downlinks to a separate TAB 2020-12-22 19:21:06 +02:00
Vladyslav_Prykhodko
3e28c960d3 UI: Fixed updated deviceProfile in bulk import devices 2020-12-22 13:40:02 +02:00
Volodymyr Babak
c89849c38d Merge branch 'develop/3.3-edge' of github.com:volodymyr-babak/thingsboard into develop/3.3-edge 2020-12-21 19:18:16 +02:00
Volodymyr Babak
e761f53dd0 Hide entity type edge if disabled. Renaming edge rule chain to rule chain templates. Minor fixes after demo 2020-12-21 19:14:22 +02:00
Vladyslav_Prykhodko
f566bff84a UI: Fixed load device-profile details 2020-12-21 18:59:54 +02:00
VoBa
0ddfdee12a
Merge pull request #70 from deaflynx/develop/3.3-edge 
Fix fetch rule nodes for EDGE/CORE rule chains scope
 2020-12-21 13:33:53 +02:00
Artem Babak
223d0423bb Fetch edge/core rule nodes cleanup 2020-12-21 13:30:43 +02:00
Artem Babak
4b5ade990e Added Manage edge for customers and filter by type 2020-12-21 13:28:53 +02:00
Artem Babak
2ba04f868c Added edge ruleNode scope 2020-12-21 11:46:02 +02:00
Volodymyr Babak
b1f4e43e8f Introduced SysParamsState. Refactored hide menu approach 2020-12-20 19:47:26 +02:00
Vladyslav_Prykhodko
ba3e779cc0 UI: Fixed Slovenian locale after merge 2020-12-19 14:40:36 +02:00
fdrobnic
c910597f62
Added Slovenian locale (#3855) 
* Add files via upload

Added Slovenian locale

* Add files via upload

* Delete locale-sl_SI.json

* Added Slovenian locale

* Delete locale-sl_SI.json
 2020-12-18 17:38:25 +02:00
Volodymyr Babak
9089163880 Hide edge menu if disabled 2020-12-18 16:29:12 +02:00
VoBa
77ad519a10
Merge pull request #67 from deaflynx/develop/3.3-edge 
Develop/3.3 edge Fix rule chain type, customerIsPublic for edges. Added EdgeInfo
 2020-12-18 14:40:44 +02:00
Volodymyr Babak
005b802c17 Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-18 14:31:56 +02:00
deaflynx
ceadc391f3 Added EdgeInfo, fix for CustomerIsPublic 2020-12-18 14:15:39 +02:00
deaflynx
4c2effd9be Fix import with rule chain type 2020-12-18 10:58:34 +02:00
Volodymyr Babak
b63087d53f Moved edge rule chains and edges to edge management page 2020-12-17 16:00:23 +02:00
Vladyslav_Prykhodko
3aa97eec06 UI: Improvement autocomplete data keys in datasource widget 2020-12-17 13:32:03 +02:00
Dmitriymush
65027b9c17 Additions to fixes after review 2020-12-16 18:42:55 +02:00
Dmitriymush
96ff9ddedd Fixes after review 2020-12-16 17:36:08 +02:00
Volodymyr Babak
b45bee7843 Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-15 18:51:56 +02:00
Vladyslav_Prykhodko
d1e0cf175e UI: Fixed load material icon fonts 2020-12-15 18:28:38 +02:00
Volodymyr Babak
a1d6cee789 Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-14 14:43:54 +02:00
Volodymyr Babak
846f5ba86b Merge remote-tracking branch 'deaflynx/develop/3.3-edge' into develop/3.3-edge 2020-12-14 12:55:07 +02:00
Volodymyr Babak
64694532db Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-14 12:48:49 +02:00
Artem Babak
5a04ebfdad Minor code beautify 2020-12-14 11:39:37 +02:00
Vladyslav_Prykhodko
e7db92dfa0 UI: Clear locales constant in czech language 2020-12-14 11:02:38 +02:00
Artem Babak
36c992e19e Edge events locales updated 2020-12-14 09:56:11 +02:00
Igor Kulikov
ef4cf0d175
Merge pull request #3833 from vvlladd28/improvement/alarm-rule/autocomplete-key-name 
UI: Added key name autocomplete in alarms rules to device profile
 2020-12-11 18:45:04 +02:00
Artem Babak
ede460c0d5 Edges rule chains: fix for default rule chains icons 2020-12-11 16:20:12 +02:00
Igor Kulikov
0407b842d2
Merge pull request #3831 from vvlladd28/improvement/font/material-load 
UI: Added preload Material Icons font
 2020-12-11 16:20:07 +02:00
Artem Babak
a736701ab8 Edge root rule chains issue fix 2020-12-11 15:32:27 +02:00
Artem Babak
a6a0a65d25 Added route for edge dashboard 2020-12-11 11:31:05 +02:00
Artem Babak
fee5034e46 Edge dashboards cell action buttons 2020-12-11 11:04:19 +02:00
Artem Babak
b285b2b00c Fix for edge rulechains 2020-12-11 10:58:36 +02:00
Dmitriymush
d128648282 Additions: servicesMap 2020-12-10 18:36:24 +02:00
Dmitriymush
235946691b Revert "Addition to ServicesMap" 
This reverts commit 0d9f36ead79ccaad8fa20528c130004bdb4574a7.
 2020-12-10 18:20:51 +02:00
Dmitriymush
0d9f36ead7 Addition to ServicesMap 2020-12-10 18:08:12 +02:00
Dmitriymush
749fbd68a5 Merge branch 'master' of https://github.com/thingsboard/thingsboard 2020-12-10 17:52:44 +02:00
Vladyslav_Prykhodko
034af204f0 UI: Added key name autocomplete in alarms rules to device profile 2020-12-10 17:33:23 +02:00
Artem Babak
3ffa7e3592 Added button unassignFromEdge for entities. Added findAssetsByTenantIdAndEdgeIdAndType() 2020-12-10 16:59:15 +02:00
Artem Babak
04e50696f6 Fix for setRootRuleChains button - for edge scope 2020-12-10 12:36:52 +02:00
Vladyslav_Prykhodko
b81a933ba2 UI: Added preload Material Icons font 2020-12-10 12:23:45 +02:00
Artem Babak
3e67a9ad0e Fix for setDefaultRoot button - only for edges scope 2020-12-10 12:16:57 +02:00
Artem Babak
4d4e4d02b5 Edge rule chains table columns updated 2020-12-10 09:56:00 +02:00