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

5782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Kulikov
072d0e49c3
Merge pull request #3990 from vvlladd28/bug/reset-password-required-email 
UI: Fixed email validation in form reset password
 2021-01-25 17:15:31 +02:00
Igor Kulikov
a67ea023d1
Merge pull request #3989 from YevhenBondarenko/improvements 
reset password improvements
 2021-01-25 17:15:02 +02:00
Vladyslav_Prykhodko
fdfd090b0b UI: Fixed email validation in form reset password 2021-01-25 17:07:14 +02:00
YevhenBondarenko
6a458e85b0 reset password improvements 2021-01-25 17:05:01 +02:00
YevhenBondarenko
4d4d189816 getPropagationEntityIds improvements 2021-01-25 13:06:11 +02:00
Igor Kulikov
d9f1872c8c Device wizard: Rollback(delete) device when failed to save device credentials. 2021-01-25 13:01:13 +02:00
Igor Kulikov
4e3a7ed897 Add overwriteActivityTime checkbox to device wizard. Update rule node ui. 2021-01-22 18:34:16 +02:00
Andrii Shvaika
90334db157 Refactoring of HTTP and MQTT client credentials 2021-01-22 17:06:53 +02:00
Andrii Shvaika
e97c742828 Merge branch 'feature/rest_api_node_ssl' of https://github.com/vkukhtyn/thingsboard 2021-01-22 16:11:43 +02:00
Andrii Shvaika
beff831d5d git push origin masterMerge branch 'zbeacon-fix/lastActivityTime' 2021-01-22 16:07:17 +02:00
Andrii Shvaika
d06ce5555c Simplified implementation of the overwrite activity time flag 2021-01-22 16:06:48 +02:00
Andrii Shvaika
5a5f29610f Merge branch 'fix/lastActivityTime' of https://github.com/zbeacon/thingsboard into zbeacon-fix/lastActivityTime 2021-01-22 15:24:12 +02:00
Igor Kulikov
ddb01aac17 Minor fixes 2021-01-22 12:30:40 +02:00
zbeacon
2d1f9b6158 Moved code to existing processing 2021-01-22 11:53:00 +02:00
Igor Kulikov
45192fc2f0
Merge pull request #3974 from lsyer/master 
Update some translations: locale.constant-zh_CN.json
 2021-01-21 18:38:14 +02:00
Igor Kulikov
1db24fbd52
Merge pull request #3970 from YevhenBondarenko/fix-device-state 
process ALARM_ACK msg in device state
 2021-01-21 18:36:59 +02:00
Igor Kulikov
9346b7fdee
Merge pull request #3972 from vvlladd28/improvement/trip-animation/change-speed 
UI: Fixed bug trip animation widget after change speed or change time to the time slider
 2021-01-21 18:36:12 +02:00
Igor Kulikov
9b8cf75c1a UI: Refactor dashboard page. Add ability to open dashboard state in separate dialog. 2021-01-21 18:03:36 +02:00
lsyer
03b5ca3571 Update some translations: locale.constant-zh_CN.json 2021-01-21 11:05:27 +08:00
Vladyslav_Prykhodko
758ce9f03e UI: Fixed bug trip animation widget after change speed or change time to the time slider 2021-01-20 19:19:47 +02:00
zbeacon
c24db73a37 Refactoring 2021-01-20 12:41:35 +02:00
zbeacon
5338d8e094 Refactoring 2021-01-20 11:44:27 +02:00
zbeacon
b2b09b3010 Improvements 2021-01-20 10:32:32 +02:00
lsyer
111949d4d9 Merge branch 'master' of https://github.com/thingsboard/thingsboard 2021-01-20 09:54:25 +08:00
Viacheslav Kukhtyn
6d99d4cafb Add default SSL context for all credentials types 2021-01-19 23:50:52 +02:00
Viacheslav Kukhtyn
9481654f5b Refactoring, deleting redundant classes 2021-01-19 20:32:18 +02:00
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