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

1484 Commits

Author SHA1 Message Date
Andrii Landiak
579a793f40 Remove unnessessary yaml config 2023-04-12 18:54:39 +03:00
Andrii Landiak
fbeb56cf70 Refactor after review and add tests for extracting by regex 2023-04-12 17:50:26 +03:00
ViacheslavKlimov
dae9a422a1 Fix entities ids replaced with tenant id in dashboard config when importing 2023-04-12 16:44:24 +03:00
ViacheslavKlimov
5a57657479 Notification preview for first recipient; Slack notification preview; increase timeouts for testDelayedNotificationRequest 2023-04-12 15:14:38 +03:00
Andrii Shvaika
4cea4362dc Merge branch 'feature/x509-device-cert-impr' of github.com:AndriiLandiak/thingsboard into feature/x509-device-provisioning 2023-04-12 12:47:41 +03:00
YevhenBondarenko
ef86dc49b9 added noxss enable param for ts and attributes 2023-04-12 11:30:04 +02:00
Andrii Dovhopoliy
1a3ee8512d
Fixed xss vulnerabilities in attributes and telemetry (#8238) 
* added noxss validation on kventries

* added noxss validation on kventries

* added ConstraintValidator usages for validation

* added test

* upd

* removed star imports

* fixed licence

* removed NoXss Annotation from values

* fixed test

* added test

* removed redundant imports

* fixed test

* upd

* fixed telemetry test controller structure

* tskv noxss validation improvements

* upd test attributes

---------

Co-authored-by: YevhenBondarenko <ybondarenko@thingsboard.io>
 2023-04-11 23:31:37 +02:00
Andrew Shvayka
b952360055
Merge pull request #8026 from volodymyr-babak/filter-type-multiple-types 
Filter type alias - add possibility to specify multiple types, instead of single one
 2023-04-11 17:26:29 +03:00
Andrew Shvayka
c683b57cba
Merge pull request #8335 from thingsboard/feature/devices-activity 
Devices activity statistics
 2023-04-11 12:23:13 +03:00
Volodymyr Babak
f6b1f15c8d Add keepAliveTimeoutSec config to edge imitator - fixed edge tests 2023-04-11 11:21:45 +03:00
ViacheslavKlimov
a58dff1ffc Refactoring for devices activity stats 2023-04-10 15:39:46 +03:00
Volodymyr Babak
c95cff74f7 Fixed edge client tests by setting correctly max inbound message size 2023-04-10 13:12:11 +03:00
ViacheslavKlimov
932cbc6e9f Increase timeout for testDevicesActivityStats 2023-04-10 10:51:02 +03:00
ViacheslavKlimov
6cb54c6690 Devices activity statistics 2023-04-07 17:06:21 +03:00
Andrew Shvayka
8769911694
Merge pull request #8256 from imbeacon/fix/alarm-assignment-user-issues 
Added getting user list for alarm assignment and ability to assign alarms for customer users
 2023-04-07 15:00:22 +03:00
Andrew Shvayka
14ed9df205
Merge pull request #6986 from adovh/feature/work-1385-custom-mqtt-subscribe-topic 
[3.5] added ability to create&subscribe custom mqtt attributes topics
 2023-04-07 13:48:20 +03:00
Andrii Landiak
e7fc00e53d Merge branch 'develop/3.5' of github.com:AndriiLandiak/thingsboard into feature/x509-device-cert-impr 2023-04-07 13:42:00 +03:00
Andrii Landiak
55adb3d12a Refactor x509: add logic of rotating x509 credentials and creating new device to DeviceProvisionService 2023-04-07 13:07:08 +03:00
dashevchenko
c07eb9e920 fixes for flaky tests 2023-04-06 17:57:37 +03:00
dashevchenko
47cf1eac77 fixes for flaky tests 2023-04-06 17:28:30 +03:00
Andrew Shvayka
87e48d9803
Merge pull request #8317 from volodymyr-babak/edge-attr-fix 
[3.5] Edge processor - delete attribute msg is not properly handled for non device type
 2023-04-06 13:04:36 +03:00
Andrew Shvayka
872a8f0c60
Merge branch 'develop/3.5' into feature/entity-usage 2023-04-06 12:12:49 +03:00
imbeacon
863b7a72ed Merge 2023-04-06 11:48:46 +03:00
Andrii Shvaika
d71307402e Merge with develop/3.5 2023-04-06 11:43:34 +03:00
Illia Barkov
ae35b45799
Merge branch 'develop/3.5' into fix/alarm-assignment-user-issues 2023-04-06 10:52:57 +03:00
YevhenBondarenko
059fad1421 merge with develop/3.5 2023-04-05 23:29:31 +02:00
Volodymyr Babak
9e189c30e6 Remove redundant JSON code 2023-04-05 16:09:41 +03:00
Volodymyr Babak
463ad698c4 Edge telemetry processor - fixed processing of delete attribute request for non device entities 2023-04-05 15:25:03 +03:00
YevhenBondarenko
60a4878ba7 improvements due to comments 2023-04-05 11:17:20 +02:00
ViacheslavKlimov
a4ad8feb7f Merge remote-tracking branch 'origin/improvements/notification-system' into improvements/notification-system 2023-04-04 12:58:57 +03:00
ViacheslavKlimov
bbaf2a5054 Notification rule trigger via ClusterService 2023-04-04 12:58:47 +03:00
Vladyslav_Prykhodko
c4bb1d8476 Merge remote-tracking branch 'upstream/develop/3.5' into improvements/notification-system 2023-04-04 12:52:24 +03:00
Andrew Shvayka
28a90e965a
Merge pull request #8274 from volodymyr-babak/edge-alarm-id 
[3.5] Alarm entity that was delivered from the edge is stored with provided ID
 2023-04-04 12:19:39 +03:00
ViacheslavKlimov
cd50eabd40 Notification rule node; refactoring 2023-04-03 19:02:23 +03:00
Andrii Shvaika
ad6f007161 Improvement to the System Info API 2023-04-03 18:46:50 +03:00
Volodymyr Babak
0fb40c8a2d Merge remote-tracking branch 'upstream/develop/3.5' into filter-type-multiple-types 2023-04-03 13:48:04 +03:00
Volodymyr Babak
8d4f1e31dc Code review updates - remove redundant alarmService.findById - use correct alarm service method based on msg type 2023-04-03 13:41:02 +03:00
ViacheslavKlimov
dc3ca22e63 Slack recipients preview and recipient params; refactoring 2023-04-03 12:21:09 +03:00
YevhenBondarenko
8481b71b7e added entity usage 2023-04-03 10:07:16 +02:00
Andrii Shvaika
b0d177ee51 Cache of the dashboard titles 2023-03-31 17:43:49 +03:00
Andrii Shvaika
95e9f5b715 Improvements 2023-03-31 17:17:12 +03:00
Andrii Shvaika
1430930bd2 Integration tests 2023-03-30 18:51:21 +03:00
ViacheslavKlimov
33dca7af71 Notification system fixes and improvements 2023-03-30 15:29:39 +03:00
ViacheslavKlimov
5c8d9e9f8d Merge branch 'develop/3.5' into improvements/notification-system 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbEntityDataSubscriptionService.java
 2023-03-30 12:14:53 +03:00
Andrii Landiak
07e00e487c Rename file for x509 test chain 2023-03-30 09:45:38 +03:00
imbeacon
2bd6a29ca4 Merge remote-tracking branch 'upstream/develop/3.5' into fix/alarm-assignment-user-issues 2023-03-30 09:28:45 +03:00
Andrii Landiak
e842c3da08 Rewrite test using self-signed test x509 certificate 2023-03-29 18:53:36 +03:00
YevhenBondarenko
2e1b0bd3cc ignore unstable test 2023-03-29 12:48:24 +02:00
Andrii Landiak
2ac861876e Refactoring: fix conflict, add logs 2023-03-29 11:40:41 +03:00
YevhenBondarenko
fca2aff3d1 minor fixes 2023-03-29 10:25:01 +02:00