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

1112 Commits

Author SHA1 Message Date
zbeacon
f29d1b0eff Added HasLabel, HasEmail, HasTitle interfaces to get correctly label in entityService, refactoring for alarms processing. The main point is swithing from Alarm entity to AlarmInfo 2022-12-13 13:39:09 +02:00
zbeacon
08e356a415 Updated alarm assignment to send websocket update on assign, added originator label to alarm info 2022-12-12 13:00:22 +02:00
zbeacon
591708b029 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2022-12-05 15:23:09 +02:00
Andrii Shvaika
770f069f22 Version set to 3.4.2 2022-12-01 12:04:14 +02:00
zbeacon
0dcde60443 Added alarm assignment feature and tests for it 2022-11-30 13:06:00 +02:00
ShvaykaD
3820909d65 bugfix: #7683 2022-11-25 16:36:32 +02:00
Igor Kulikov
d10f64c348 Refactor MVEL -> TBEL 2022-11-22 16:38:01 +02:00
Andrew Shvayka
a1c4d29e48
Merge pull request #7636 from ViacheslavKlimov/fix/additional-info-xss 
[3.4.2] Validation for entity's additionalInfo
 2022-11-17 17:40:46 +02:00
ViacheslavKlimov
e7995fb02c Validation for entity's additionalInfo 2022-11-17 15:33:12 +02:00
Andrii Shvaika
0d1412cd46 Merge branch 'jwt-random' of github.com:smatvienko-tb/thingsboard 2022-11-17 11:50:56 +02:00
Volodymyr Babak
1d9a2bad84 Improve error handling - root cause and stack trace delivered to cloud from edge in case of errors 2022-11-15 14:59:14 +02:00
Sergey Matvienko
7e5ab3bff7 JWT settings refactored packages, Swagger documented, rest client getJwtSettings and saveJwtSettings added 2022-11-14 18:52:57 +01:00
Volodymyr Babak
0a56f065f7 Merge RPC request/response actions 2022-11-10 09:35:06 +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
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
YevhenBondarenko
03aafd4c3c added TbServiceQueue asset validation and upgrade improvements 2022-11-09 13:28:42 +01:00
Volodymyr Babak
22118af4db Added Edge RPC response/request support 2022-11-08 13:13:58 +02:00
Andrii Shvaika
9def5a30c6 Add missing method to StringUtils 2022-11-08 10:55:28 +02:00
Andrii Shvaika
0873b9e158 Improvements to #7434 2022-11-07 18:12:28 +02:00
Andrii Shvaika
6e33b09205 Merge branch 'feature/jwt-token-outdate-on-logout' of github.com:CooL16/thingsboard 2022-11-07 17:30:23 +02:00
oyurov
4fad587940 Refactoring 2022-11-03 16:52:15 +01:00
oyurov
3ab1f34594 Clean code 2022-11-02 14:07:49 +01:00
oyurov
6d34aa237c Refactoring 2022-11-02 13:03:17 +01:00
ShvaykaD
e9961a3a39 merge with master 2022-11-02 12:00:05 +02:00
oyurov
d10289253f Refactor 2022-11-02 08:46:58 +01:00
Volodymyr Babak
19287fa250 Merge remote-tracking branch 'origin/master' into feature/edge-limit-attempt 2022-10-31 19:09:25 +02:00
Andrew Shvayka
3844ff6372
Merge pull request #7395 from volodymyr-babak/feature/edge-multi-customers 
[3.4.2] Edge PE - customers hierarchy support
 2022-10-31 18:49:01 +02:00
Andrew Shvayka
7ba76e8f59
Merge pull request #7483 from deaflynx/version-control-read-only 
[3.4.2] Feature: Version control Repository settings with 'Read-only' flag
 2022-10-31 18:05:58 +02:00
Andrew Shvayka
f20d87e894
Merge pull request #7360 from devaskim/selective_widget_bundler_version_control 
[3.4.2] UI: Let user to selective export widget bundles to version control.
 2022-10-31 13:54:35 +02:00
Volodymyr Babak
7c80781c24 Minor code refactoring - added tenant as entity id 2022-10-28 15:41:57 +03:00
Andrii Shvaika
bfe79780dd MVEL executor improvements 2022-10-27 14:03:48 +03:00
ViacheslavKlimov
a53a50e99f Read-only option in VC repository settings 2022-10-25 12:07:57 +03:00
Andrew Shvayka
4cc7e7b373
Merge pull request #7456 from ViacheslavKlimov/fix/sql-deadlock-info 
[3.4.2] SQL batch sort enabled by default; additional deadlock logging
 2022-10-24 18:25:16 +03:00
Andrew Shvayka
73868338c8
Merge pull request #7238 from YuriyLytvynchuk/feature/delete_attributes_node 
[3.4.2] Feature: New RuleNode "delete attributes"
 2022-10-24 13:34:55 +03:00
ViacheslavKlimov
35960d018e SQL batch sort enabled by default; additional deadlock logging 2022-10-19 18:33:50 +03:00
Andrii Shvaika
d3f06bd3a4 MVEL executor implementation 2022-10-18 18:39:43 +03:00
Volodymyr Babak
cc4029120a Merge remote-tracking branch 'upstream/master' into feature/edge-multi-customers 2022-10-12 17:34:32 +03:00
Volodymyr Babak
366583cc0a Merge remote-tracking branch 'upstream/master' into feature/edge-multi-customers 2022-10-07 23:19:28 +03:00
ShvaykaD
6e34747b95 added HasRuleEngineProfile interface & refactored DefaultTbContext 2022-10-06 19:42:30 +03:00
ViacheslavKlimov
caea6aa27b Save audit log with entity name replaced if it is malformed 2022-10-06 13:48:06 +03:00
ViacheslavKlimov
d86c20b354 Additional validation for AuditLog entity 2022-10-06 11:47:27 +03:00
Andrii Shvaika
7e927b7aba Add support of relation add/update/delete events to rule engine 2022-10-05 13:46:01 +03:00
devaskim
40dc0467bd Let user to selective export widget bundles to version control. 2022-10-02 14:47:56 +05:00
Igor Kulikov
34339c6532 Minor changes 2022-09-23 19:26:50 +03:00
Igor Kulikov
afa69f6f78 Merge branch 'master' into feature/assetProfile 2022-09-23 15:37:52 +03:00
Igor Kulikov
085e3c1580 Implement Asset Profile feature 2022-09-23 15:37:17 +03:00
Andrii Shvaika
6674c457f6 Fix issue with delta calculation when previous interval has no telemetry 2022-09-23 13:45:34 +03:00
Andrii Shvaika
b1a234eba2 Add clear of agg data before subscription update 2022-09-23 13:10:38 +03:00
Andrew Shvayka
27948261ce
Merge pull request #7246 from YuriyLytvynchuk/bug/node_originator_fields_check_null 
[3.4.2] Bugfix: originator fields node: check value for "null"
 2022-09-22 16:32:52 +03:00
Volodymyr Babak
15c433212a Code refactoring - remove duplicate variables 2022-09-22 09:24:44 +03:00