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

2675 Commits

Author SHA1 Message Date
ViacheslavKlimov
654e61683a Improvements and refactoring 2023-01-06 17:50:34 +02:00
ViacheslavKlimov
141bd74113 Notification target and template api docs; improvements 2023-01-02 17:25:03 +02:00
Andrii Shvaika
509da5dee4 Merge branch 'feature/notification-system' of github.com:ViacheslavKlimov/thingsboard into feature/notification-system 2022-12-27 13:07:55 +02:00
Andrii Shvaika
34d7a6ced8 Merge remote-tracking branch 'origin/master' into develop/3.5 2022-12-27 13:06:46 +02:00
ViacheslavKlimov
409976c6a3 Multiple notification targets for request; improvements and refactoring 2022-12-23 18:47:40 +02:00
Andrew Shvayka
19513ec027
Merge pull request #7804 from ShvaykaD/feature/base-entity-service-improvement 
[3.5] improvements for base entity service v2
 2022-12-22 14:14:47 +02:00
ShvaykaD
652a8c9e89 added getEntityType method in EntityDaoService 2022-12-22 13:02:39 +02:00
ViacheslavKlimov
7792e80283 Merge branch 'master' into feature/notification-system 2022-12-21 17:53:41 +02:00
ViacheslavKlimov
0a17f99360 Refactoring; TbSlackNode 2022-12-21 15:04:06 +02:00
ViacheslavKlimov
738b9dc494 Slack notification channel; refactoring 2022-12-19 19:56:20 +02:00
ViacheslavKlimov
55fc7131fb Validation for rule node configuration; improve validation error message 2022-12-17 16:58:58 +02:00
ShvaykaD
3d27340cb5 fix audit log tests 2022-12-16 15:52:20 +02:00
ViacheslavKlimov
4b39d2a221 Notification request stats 2022-12-15 15:50:01 +02:00
ShvaykaD
5c5b83c4ce updated logic & fix typos after review 2022-12-15 15:10:38 +02:00
Andrii Shvaika
aadc2e35b7 Merge with master 2022-12-15 14:27:13 +02:00
ViacheslavKlimov
a6bfb049aa Improvements for notification templates 2022-12-14 19:02:23 +02:00
Andrii Shvaika
68ffd803fe Merge branch 'feature/base-entity-service-improvement' of github.com:ShvaykaD/thingsboard into develop/3.5 2022-12-14 16:42:38 +02:00
ViacheslavKlimov
deb2867df1 Multiple notification delivery methods; notification templates 2022-12-14 14:27:20 +02:00
ShvaykaD
7d9f437927 rollback optional changes for fetchEntityCustomerId method 2022-12-14 12:37:19 +02:00
ShvaykaD
f167c7c48b code cleanup after review 2022-12-14 12:30:27 +02:00
ViacheslavKlimov
1ba77a30d7 Merge branch 'master' into feature/notification-system 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java
#	application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
 2022-12-13 12:55:21 +02:00
ShvaykaD
0bef324a1f refactoring after review 2022-12-12 19:18:45 +02:00
Andrew Shvayka
5e1fa45a10
Merge pull request #7768 from ViacheslavKlimov/fix/pagelink-validation 
[3.4.3] Additional pageLink validation
 2022-12-12 16:35:46 +02:00
Andrew Shvayka
0ee678e234
Merge pull request #7761 from ViacheslavKlimov/fix/entity-view-ts 
[3.4.3] Fix no timeseries data in widget for entity view; fix State Chart invalid behavior
 2022-12-12 15:54:29 +02:00
ViacheslavKlimov
4851f1af9f Fix comparing entity versions: ignore tenantId and createdTime 2022-12-09 19:03:57 +02:00
ViacheslavKlimov
808b1dc0c5 'Show merge commits' option in repository settings 2022-12-09 18:31:59 +02:00
ShvaykaD
661480ff39 base entity service improvement: init commit 2022-12-09 17:33:17 +02:00
ViacheslavKlimov
2494cec616 Add validation for EntityDataPageLink 2022-12-09 16:25:09 +02:00
Andrew Shvayka
f813073bfb
Merge pull request #7596 from imbeacon/mqtt5-codes 
[3.5] Added Mqtt v5 reason codes for ack messages
 2022-12-08 14:40:14 +02:00
ViacheslavKlimov
28d6e4c736 Copy queryId when updating query 2022-12-08 13:16:34 +02:00
zbeacon
6fad315a03 Added changes due to comments 2022-12-06 12:55:45 +02:00
Igor Kulikov
109caee7c7 Version set to 3.4.3-SNAPSHOT 2022-12-05 17:54:19 +02:00
imbeacon
0cbf163e8f Merge remote-tracking branch 'upstream/develop/3.5' into mqtt5-codes 2022-12-02 09:37:58 +02:00
Andrii Shvaika
770f069f22 Version set to 3.4.2 2022-12-01 12:04:14 +02:00
Igor Kulikov
13e2f01af3 Update TBEL version to 1.0.3. 2022-11-30 20:57:54 +02:00
Andrew Shvayka
90238ffaa8
Merge pull request #7684 from ShvaykaD/bugfix/7683 
[3.4.2] Missed logic for sending attributes deleted notification to device in the Delete Attributes node
 2022-11-28 14:51:12 +02:00
Igor Kulikov
5045a76062 Update TBEL version to 1.0.1. Improve TBEL helper functions. 2022-11-28 12:36:11 +02:00
Andrii Shvaika
acfd8afa0c TBEL Utils and tests 2022-11-25 19:55:15 +02:00
ShvaykaD
2502041aa5 bugfix #7683: refactoring after PR review 2022-11-25 17:03:05 +02:00
ShvaykaD
3820909d65 bugfix: #7683 2022-11-25 16:36:32 +02:00
Andrii Shvaika
c99c52c809 Add useful classes to MVEL 2022-11-24 17:32:48 +02:00
Igor Kulikov
d10f64c348 Refactor MVEL -> TBEL 2022-11-22 16:38:01 +02:00
ViacheslavKlimov
a4ce6252de Retrieve notification info from request when selecting notifications 2022-11-19 15:03:41 +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
Andrew Shvayka
e08870bd2a
Merge pull request #7595 from volodymyr-babak/rest-client-updates 
[3.4.2] RestClient updates. Remove default connection from RPC from device to push to cloud
 2022-11-16 16:53:18 +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
ViacheslavKlimov
1283093681 Synchronize doEvalScript and doRelease operations in MvelInvokeService 2022-11-14 19:02:52 +02:00