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

5606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YevhenBondarenko
24ebc06fa4 process ALARM_ACK msg in device state 2021-01-19 17:06:53 +02:00
Viacheslav Kukhtyn
85bfbce2a4 Fix for basic credentials 2021-01-18 18:13:32 +02:00
vkukhtyn
5513caee97
MQTT, REST API call: make CA cert or client cert-key pair optional 2021-01-18 17:10:24 +02:00
Igor Kulikov
c1223b0c10
Merge pull request #3965 from ChantsovaEkaterina/improvement/services-map-import-export 
Add ImportExport service to Services Map
 2021-01-18 15:02:46 +02:00
Chantsova Ekaterina
dac700d4fe Add ImportExport service to Services Map 2021-01-18 14:06:35 +02:00
zbeacon
3b65e3c23c Refactoring 2021-01-18 13:50:00 +02:00
Chantsova Ekaterina
85563d7ae8 MQTT, REST API call: make CA cert or client cert-key pair optional 2021-01-18 13:23:36 +02:00
lsyer
0f24e00fea Merge branch 'master' of https://github.com/thingsboard/thingsboard 2021-01-17 14:58:07 +08:00
zbeacon
1bdd7d69bf Fix for lastActivityTime in devices created by gateway 2021-01-15 18:55:35 +02:00
Viacheslav Kukhtyn
fb460d7215 Changes after code review 2021-01-15 16:34:06 +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
Igor Kulikov
cff36668ed
Merge pull request #3940 from kalutkaz/fixMapPolygon 
[3.2.1] Fix map polygon
 2021-01-15 12:19:38 +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
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
Chris Elston
3c308dc242 Merge branch 'master' of https://github.com/thingsboard/thingsboard 2021-01-14 12:27:02 +00: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
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
lsyer
18a12c142f Merge branch 'master' of https://github.com/thingsboard/thingsboard 2021-01-14 10:22:20 +08: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
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
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
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
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
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
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
Viacheslav Kukhtyn
de7e25f731 CA cert or client cert-key pair could be optional 2021-01-09 17:52:27 +02:00
Viacheslav Kukhtyn
9c3fae2f8e Merge branch 'master' into feature/rest_api_node_ssl 2021-01-08 17:34:02 +02:00
Viacheslav Kukhtyn
e6a30ca03b Add credentials for REST API call node 2021-01-08 17:32:43 +02:00