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

7013 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vladyslav_Prykhodko
733c0f1bad UI: Fixed updated map after call example custom action "Delete polygon/marker" 2021-01-14 16:54:36 +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
Chris Elston
3c308dc242 Merge branch 'master' of https://github.com/thingsboard/thingsboard 2021-01-14 12:27:02 +00:00
deaflynx
9b27bb2d7c Import edges with update 2021-01-14 14:23:00 +02:00
Chris Elston
d3f018b0ef Add config params for server and client key algs 
This change adds new parameters to keygen.properties to allow the
configuration of the server and client TLS key algorithms:

SERVER_KEY_ALG, SERVER_KEY_SIZE, CLIENT_KEY_ALG, CLIENT_KEY_SIZE

Default values for these have been set at RSA and 2048 to preserve
previous operation.

I have also tested SERVER_KEY_ALG=EC and SERVER_KEY_SIZE=256, along with
CLIENT_KEY_ALG=EC and CLIENT_KEY_SIZE=256. Other algorithms and sizes
may be supported, YMMV.
 2021-01-14 12:12:13 +00: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
Igor Kulikov
03457a3566
Merge pull request #3949 from ShvaykaD/master 
[3.2.1] added new method to JacksonUtil & replaced objectMapper from AuditLogServiceImpl
 2021-01-14 10:45:06 +02:00
ShvaykaD
27e15ab7d8 merge after cherry-pick 2021-01-14 10:41:14 +02:00
ShvaykaD
b0e6f72658 added new methods to JacksonUtil & replaced objectMapper from AuditLogServiceImpl 2021-01-14 10:36:15 +02:00
Igor Kulikov
477c3979a9
Merge pull request #3948 from ShvaykaD/audit-log-service-impl-mapper-replacement 
[2.5.6] added new methods to JacksonUtil & replaced objectMapper from AuditLogServiceImpl
 2021-01-14 10:34:33 +02:00
Viacheslav Kukhtyn
f0ff92eef5 Update headers 2021-01-14 10:32:01 +02:00
Viacheslav Kukhtyn
bcb1fb1800 Merge branch 'master' into feature/rest_api_node_ssl 2021-01-14 10:29:47 +02:00
Igor Kulikov
9409acfe44
Merge pull request #3939 from Dmitriymush/fix/docker_haproxy 
[3.2.x]Fixed: "/static/widgets/" included to acl path_beg of haproxy configuration
 2021-01-14 10:24:06 +02:00
ShvaykaD
143e9cb877 added new methods to JacksonUtil & replaced objectMapper from AuditLogServiceImpl 2021-01-14 10:21:51 +02:00
lsyer
18a12c142f Merge branch 'master' of https://github.com/thingsboard/thingsboard 2021-01-14 10:22:20 +08:00
Artem Babak
118ba1ad8d Get edge label 2021-01-13 21:08:29 +02:00
Artem Babak
f8e80aa94b Fix import edges, update() is not working 2021-01-13 20:43:11 +02:00
Igor Kulikov
b765556390
Merge pull request #3945 from mp-loki/feature/max-debug-symbols 
Max Debug Event symbols configurable
 2021-01-13 19:17:03 +02:00
Volodymyr Babak
d8de53c186 Code review fixes 2021-01-13 18:43:49 +02:00
Dmitriymush
20a4163cce fix additions 2021-01-13 16:40:50 +02:00
Igor Kulikov
b83811eb3f
Merge pull request #3935 from vvlladd28/bugs/map-chart 
[3.x] Fixed bugs in chart and map widgets
 2021-01-13 16:34:56 +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
Valerii Sosliuk
f2a31da65e Max Debug Event symbols configurable 2021-01-13 11:33:35 +02:00
Valerii Sosliuk
7613f02586 Fix update device profile 2021-01-13 11:16:52 +02:00
VoBa
f99d7171a2
Merge pull request #75 from deaflynx/develop/3.3-edge 
Code restyle: single instead of double quotes, deleted unused imports
 2021-01-13 08:28:35 +02:00
Artem Babak
0e00c45e2e Hide edge buttons for customer if edges_enabled=false 2021-01-13 06:32:13 +02:00
Artem Babak
ede0df0d6b Code restyle: single instead of double quotes, deleted unused imports 2021-01-12 22:01:32 +02:00
YevhenBondarenko
1edd552529 added EntityView type support 2021-01-12 16:49:37 +02:00
YevhenBondarenko
6f6d8b9d50 fixed timeouts in TbDeviceProfileNode 2021-01-12 16:48:44 +02:00
Artem Babak
752183f099 Code cleanup 2021-01-12 15:34:35 +02:00
Artem Babak
0ba88ccd69 Locales update 2021-01-12 15:26:01 +02:00
Artem Babak
43570a483c Fix customerTitle for customer with nullUid 2021-01-12 14:49:20 +02:00
Kalutka Zhenya
6932a32b87 change polygon script for image map, Refactoring 2021-01-12 11:56:31 +02:00
Dmitriymush
fd2db7498f Fixed: "/static/" included to acl path_beg 2021-01-12 11:55:51 +02:00
nickAS21
cb3353a32d Lwm2m: backEnd: refactoring start server/bootstrap without different secure 2021-01-12 11:31:20 +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
deaflynx
bedb1d6245 Edge overview widget final 2021-01-11 14:46:28 +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
deaflynx
17ed82876a Edges overview widget cleanup 2021-01-11 10:54:18 +02:00