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

11949 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Shvayka
6a75cd076f
Merge pull request #7602 from volodymyr-babak/master 
[3.4.2] mute TelemetryEdgeSqlTest that causes a lot of randomly generated errors
 2022-11-14 17:25:19 +02:00
Andrew Shvayka
ac7d1dd2c3
Merge pull request #7589 from ShvaykaD/bugfix/7588 
[3.4.2] Bugfix of alarm count query with null sortOrder and textSearch specified.
 2022-11-14 17:24:29 +02:00
Igor Kulikov
25f8ff2aef Handle undefined script execution result. 2022-11-14 15:37:54 +02:00
Sergey Matvienko
4fc13b7938 Merge remote-tracking branch 'ce/master' into jwt-random 2022-11-14 14:32:02 +01:00
Vladyslav_Prykhodko
dde62fc518 UI: Fixed generate length signing key 2022-11-14 15:16:33 +02:00
Vladyslav_Prykhodko
1d230f1945 UI: Fixed generate length signing key 2022-11-14 15:03:55 +02:00
Sergey Matvienko
46b2adeb2c jwt settings added message on base64 validation exception, default key is to be validated ok, tests added 2022-11-14 13:43:56 +01:00
Igor Kulikov
51ec17d9d1 Update MVEL version to 2.4.25TB 2022-11-14 14:41:10 +02:00
Yevhen Bondarenko
5b1642246d
[3.4.2] fix start js (#7614) 
* refactoring

* fixed start js-executor typo
 2022-11-14 14:30:05 +02:00
Sergey Matvienko
335d88c82e jwt settings added message on base64 validation exception 2022-11-14 12:27:04 +01:00
Andrew Shvayka
1d2097d2bf
Merge pull request #7613 from YevhenBondarenko/feature/js-executor-improvements 
[3.4.2] js-executor improvements
 2022-11-14 12:48:56 +02:00
Igor Kulikov
b02a2215db Update MVEL version to 2.4.24TB 2022-11-14 12:33:17 +02:00
YevhenBondarenko
11bd9b5257 added nodejs memory leak workaround 2022-11-14 11:28:30 +01:00
YevhenBondarenko
e32bd456b7 added memory usage log to the js-executors 2022-11-14 11:07:09 +01:00
Vladyslav_Prykhodko
fc1da12999 UI: Add JWT security settings form and restyle security page 2022-11-14 11:05:47 +02:00
Volodymyr Babak
8a29dc294e mute TelemetryEdgeSqlTest that causes a lot of randomly generated errors 2022-11-11 17:41:12 +02:00
ShvaykaD
7b9c9e51cd update build of main query for alarm count query 2022-11-11 14:41:15 +02:00
dashevchenko
2602359026 Merge remote-tracking branch 'upstream/master' into testRefactoring 2022-11-11 12:55:59 +02:00
Yuriy Lytvynchuk
f49b349396 refactor code 2022-11-11 12:50:55 +02:00
dashevchenko
e11b5ffedd refactoring 2022-11-11 12:33:16 +02:00
dashevchenko
62ca7447c4 refactoring 2022-11-11 11:06:36 +02:00
dashevchenko
b1d5e89e9c refactoring 2022-11-11 10:51:25 +02:00
Yuriy Lytvynchuk
a00d68f477 delete cases: TENANT, DASHBOARD, CUSTOMER 2022-11-11 10:06:02 +02:00
Sergey Matvienko
b776cf13b6 jwt settings code cleanup 2022-11-10 23:48:08 +01:00
Sergey Matvienko
27d26ea27c jwt settings validation except install, warn on each reload if token key is default 2022-11-10 19:06:21 +01:00
Sergey Matvienko
b95f1c95e0 jwt settings workout on review feedback 2022-11-10 18:00:54 +01:00
dashevchenko
1ab4c03622 fixed license format 2022-11-10 18:30:05 +02:00
Volodymyr Babak
1b191acace RestClient - add getRuleChains by type. Updated edge_root_rule_chain - remove Success from RPC Call from device to Push to cloud 2022-11-10 17:23:46 +02:00
Andrii Shvaika
6223307cd8 Add validation for Asset Profile FK in Rule Chains 2022-11-10 17:04:48 +02:00
Andrew Shvayka
4a2386918a
Merge pull request #7592 from volodymyr-babak/feature/edge-rpc-call-from-device 
[3.4.2] Device to Server (cloud) RPC Requests
 2022-11-10 14:06:05 +02:00
Sergey Matvienko
1f1c8fb013 saveJwtSettings returns JwtTokenPair in AdminController 2022-11-10 10:41:34 +01:00
Volodymyr Babak
d8a6093442 Added TbSendRPCReplyNodeTest 2022-11-10 11:36:46 +02:00
Sergey Matvienko
17a50ab70b Merge remote-tracking branch 'ce/master' into jwt-random 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
#	application/src/main/java/org/thingsboard/server/service/security/auth/TokenOutdatingService.java
#	application/src/test/java/org/thingsboard/server/service/security/auth/TokenOutdatingTest.java
 2022-11-10 09:54:27 +01:00
Volodymyr Babak
15b26f4317 Remove Nullable annotation 2022-11-10 10:37:14 +02:00
Volodymyr Babak
0a56f065f7 Merge RPC request/response actions 2022-11-10 09:35:06 +02:00
Sergey Matvienko
1a9b8a1ebe JwtSettingsService workout: Lazy and Optional clusterService, correctness on first Install and upgrade, reload JWT on cluster notification, update jwt settings using existing id 2022-11-09 23:28:34 +01:00
Sergey Matvienko
7186632e5a lombok.copyableAnnotations += org.springframework.context.annotation.Lazy 2022-11-09 23:24:09 +01:00
Volodymyr Babak
54f967e944 Remove unused file 2022-11-09 18:35:18 +02:00
Volodymyr Babak
8b46b30747 Merge remote-tracking branch 'upstream/master' into feature/edge-rpc-call-from-device 2022-11-09 18:34:01 +02:00
Volodymyr Babak
1635d883a7 Rename variable 2022-11-09 18:32:51 +02:00
Volodymyr Babak
5ff8144f8d Code cleanup 2022-11-09 18:31:08 +02:00
Igor Kulikov
0da4624a2d
Merge pull request #7591 from vvlladd28/bug/manage-dashboard-layout/setFixedLayout 
[3.4.2] UI: Fixed function setFixedLayout in dashboard layout
 2022-11-09 18:06:53 +02:00
Vladyslav_Prykhodko
385c3acaee UI: Fixed dashboard layout function setFixedLayout 2022-11-09 17:56:38 +02:00
Igor Kulikov
1b5d988d71 Improve upgrade from 3.4.1 to clear assets and repositorySettings cache 2022-11-09 17:43:47 +02:00
ShvaykaD
323d3d5138 fix bug for findAlarmDataByQueryForEntities method when sortOrder is null and textSearch used 2022-11-09 16:33:43 +02:00
Andrew Shvayka
08534d68c5
Merge pull request #7544 from dmytro-landiak/inactivity-fix 
[3.4.2] inactivity timeout fix
 2022-11-09 16:15:09 +02:00
dlandiak
4a3e867155 fix tests in device state svc 2022-11-09 15:57:18 +02:00
dlandiak
aefef78fda added defaultInactivityTimeoutMs param to device state svc 2022-11-09 15:47:12 +02:00
Andrew Shvayka
ef1965ed44
Merge pull request #7560 from YevhenBondarenko/feature/asset-profile-upgrade 
[3.4.2] upgrade asset-profiles using ExecutorService
 2022-11-09 15:34:45 +02:00
Volodymyr Babak
20609722f5 Added RPC_REQUEST and RPC_RESPONSE to the front-end 2022-11-09 15:30:45 +02:00