Volodymyr Babak
57bf6c0903
Code review updates
2021-01-15 17:56:41 +02:00
Volodymyr Babak
fdc23a4b40
Merge remote-tracking branch 'upstream/develop/2.5.6' into develop/2.6-edge
2021-01-15 16:54:06 +02:00
Viacheslav Kukhtyn
fb460d7215
Changes after code review
2021-01-15 16:34:06 +02:00
nickAS21
efb671f480
Lwm2m: back: for test4
2021-01-15 15:08:31 +02:00
nickAS21
79f8b87133
Lwm2m: back: for test3
2021-01-15 14:51:55 +02:00
Igor Kulikov
e6056ec8a0
Merge pull request #3951 from cdelston0/master
...
Add support for generating server and client keys with alternative TLS algorithms
2021-01-15 13:34:38 +02:00
Igor Kulikov
39394f1a8e
Merge pull request #3944 from mp-loki/bug/device-profile-update
...
Fix update device profile
2021-01-15 13:31:54 +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
nickAS21
9cdd916276
Lwm2m: back: for test2
2021-01-15 10:45:18 +02:00
nickAS21
1f094d58ab
Lwm2m: back: for test
2021-01-15 09:17:42 +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
nickAS21
33a900145c
Lwm2m: back: created sh with many certX509
2021-01-14 19:24:19 +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
Igor Kulikov
5caba21891
Update TB install service
2021-01-14 17:36:09 +02:00
Igor Kulikov
d2595d880f
Merge pull request #3952 from vvlladd28/bug/maps/delete-marker-polygon
...
UI: Fixed updated map after call example custom action "Delete polygo…
2021-01-14 17:34:02 +02:00
Igor Kulikov
9cafa70721
Merge pull request #3950 from vvlladd28/improvement/widget-action/open-dashboard
...
[3.2.1] UI: Added a new settings "Open in a new browser tab" in the widget action
2021-01-14 17:26:37 +02:00
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
