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

1287 Commits

Author SHA1 Message Date
Vladyslav_Prykhodko
c8814f7cfa UI: Refactoring lwm2m 2021-01-19 19:36:57 +02:00
nickAS21
cfa9a5778a Lwm2m: front: refactoring 2021-01-19 16:24:58 +02:00
Chantsova Ekaterina
dac700d4fe Add ImportExport service to Services Map 2021-01-18 14:06:35 +02:00
deaflynx
24ad822443 Merge with volodymy-babak updates 2021-01-18 12:51:52 +02:00
lsyer
0f24e00fea Merge branch 'master' of https://github.com/thingsboard/thingsboard 2021-01-17 14:58:07 +08:00
Volodymyr Babak
bc3008ad7b Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2021-01-17 01:47:49 +02:00
zbeacon
1bdd7d69bf Fix for lastActivityTime in devices created by gateway 2021-01-15 18:55:35 +02:00
Volodymyr Babak
57bf6c0903 Code review updates 2021-01-15 17:56:41 +02:00
Vladyslav
cd6a76de86
Improvement/lwm2m/refactoring 1 (#3956) 
UI: Refactoring lwm2m
 2021-01-15 13:06:39 +02:00
Igor Kulikov
cff36668ed
Merge pull request #3940 from kalutkaz/fixMapPolygon 
[3.2.1] Fix map polygon
 2021-01-15 12:19:38 +02:00
Artem Babak
c90eb8bb63 ES,DE,FR locale update for Edge 2021-01-15 06:02:34 +02:00
Artem Babak
51bc0a2f17 US locale update 2021-01-15 05:29:42 +02:00
Kalutka Zhenya
7f8c3ad0b3 Refactoring 2021-01-14 19:28:56 +02:00
Kalutka Zhenya
ac0a3fdf5c update logics 2021-01-14 19:21:56 +02:00
Kalutka Zhenya
93155fb19d Update script for maps 2021-01-14 17:48:12 +02:00
Volodymyr Babak
dd879efad6 Updated enum to be uppercase. Use RuleChainType in the rule chain service 2021-01-14 16:09:07 +02:00
nickAS21
84698ad554 Lwm2m: front - fix bug /../../ 2021-01-14 16:04:58 +02:00
deaflynx
bbb625c67f Merge voba with new rulechain type 2021-01-14 15:04:04 +02:00
deaflynx
9b27bb2d7c Import edges with update 2021-01-14 14:23:00 +02:00
Vladyslav_Prykhodko
149a1dc990 UI: Added a new settings "Open in a new browser tab" in the widget action "Navigate to other dashboard" 2021-01-14 13:17:23 +02:00
lsyer
18a12c142f Merge branch 'master' of https://github.com/thingsboard/thingsboard 2021-01-14 10:22:20 +08:00
Artem Babak
f8e80aa94b Fix import edges, update() is not working 2021-01-13 20:43:11 +02:00
Volodymyr Babak
d8de53c186 Code review fixes 2021-01-13 18:43:49 +02:00
Artem Babak
226f7f4eba Move ruleChainType assignment from validateImportedRuleChain() to importRuleChain() 2021-01-13 16:26:16 +02:00
Artem Babak
4b94ffe5b5 Show edge info for Tenant in edgeScope === 'customer' 2021-01-13 16:16:01 +02:00
Artem Babak
e6b156df63 Hide edge management for customers if Edge is disabled 2021-01-13 15:34:00 +02:00
Artem Babak
ede0df0d6b Code restyle: single instead of double quotes, deleted unused imports 2021-01-12 22:01:32 +02:00
Kalutka Zhenya
6932a32b87 change polygon script for image map, Refactoring 2021-01-12 11:56:31 +02:00
lsyer
be1fc2e16a Merge branch 'master' of https://github.com/thingsboard/thingsboard 2021-01-12 15:45:31 +08:00
lsyer
fb193bf66e Update locale.constant-zh_CN.json 2021-01-12 15:20:01 +08:00
nickAS21
17700fe186 Lwm2m: backEnd: refactoring after update dependencies: <californium.version>2.6.0</californium.version> 
<leshan-server.version>1.3.0</leshan-server.version>
                                                 <leshan-core.version>1.3.0</leshan-core.version>
                                                 <leshan-client.version>1.3.0</leshan-client.version>
 2021-01-11 19:26:12 +02:00
Vladyslav_Prykhodko
5186c756ce UI: Fixed updated marker tooltip function in map widgets 2021-01-11 18:44:14 +02:00
Vladyslav_Prykhodko
949d283744 UI: Refactoring code; Fixed not work setting: "Show cumulative values in stacking mode" 2021-01-11 18:39:49 +02:00
Kalutka Zhenya
385b1484ee polygonMapFixV2 2021-01-11 18:38:42 +02:00
Igor Kulikov
d31358b2ea Update license header - set 2021 year 2021-01-11 13:42:16 +02:00
Igor Kulikov
c831d9650f
Merge pull request #3906 from lsyer/master 
Update 'locale.constant-zh_CN.json'
 2021-01-11 13:12:21 +02:00
Igor Kulikov
d5e7019cfa
Merge pull request #3916 from hardshell/bug/flot-widget-tooltip-not-hiding 
added - hide flot tooltip on chart destroying, prevent showing tooltip on flot hover, if edit mode is on.
 2021-01-11 13:11:06 +02:00
Volodymyr Babak
aea83e19fa Removed TODO comment after discussion with Vlad 2021-01-11 10:35:47 +02:00
Volodymyr Babak
2bd819ebd4 Added rule chain type to edge dialog. Update default edge root rule chain 2021-01-10 01:27:49 +02:00
Volodymyr Babak
c07fcf7ba5 Added rule chain type to rule node 2021-01-09 12:43:08 +02:00
Volodymyr Babak
685e89ea87 Code review fixes 2021-01-08 21:39:34 +02:00
Igor Kulikov
02714512fa Improve timezone-select component 2021-01-05 16:22:15 +02:00
Igor Kulikov
75d18d7303 Improve timezone-select component 2021-01-05 16:20:30 +02:00
Igor Kulikov
8766902d45 UI: Class/Models optimizations 2021-01-05 16:09:39 +02:00
Volodymyr Babak
02b5462720 Merge branch 'develop/3.3-edge' of github.com:volodymyr-babak/thingsboard into develop/3.3-edge 2021-01-05 14:49:15 +02:00
Serhii Mikhnytskyi
6ec9b9c7e1 added - hide flot tooltip on chart destroying, prevent showing tooltip on flot hover, if edit mode is on. 2021-01-05 13:52:32 +02:00
Igor Kulikov
ed56f041f8 UI optimizations 2021-01-05 11:37:05 +02:00
VoBa
1b490bf5f4
Merge pull request #72 from deaflynx/develop/3.3-edge 
Develop/3.3 edge Edges Overview Widget
 2021-01-05 10:50:01 +02:00
Volodymyr Babak
c3e1eee6c9 Fixed createdTime storage. Fixed copy edge secret and key button 2021-01-04 19:45:23 +02:00
deaflynx
17ecaa9660 Edge widget incorrect datasource type message 2021-01-04 15:02:53 +02:00