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

2531 Commits

Author SHA1 Message Date
Andrew Shvayka
2f0eb0beb7
Merge pull request #8241 from dashevchenko/WS_Message_queue_per_session_size 
Changed default for wsMsgQueueLimitPerSession
 2023-04-12 18:06:48 +03:00
Andrii Landiak
fbeb56cf70 Refactor after review and add tests for extracting by regex 2023-04-12 17:50:26 +03:00
Andrew Shvayka
90a0edd2d4
Merge pull request #8350 from dashevchenko/redundantNotNull 
Deleted redundant @NotNull annotations
 2023-04-12 17:34:31 +03:00
Andrii Shvaika
5d84945ccd Review and improvements 2023-04-12 14:06: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 Landiak
03b0d0a90a Add yaml config variables into test properties 2023-04-12 11:34:37 +03:00
Andrii Landiak
71f936f687 Add yaml config for java cacerts path and password to be able to configure 2023-04-12 11:03:59 +03: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
dashevchenko
abfaeac087 deleted redundant @NonNull annotation 2023-04-11 16:09:54 +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
Andrii Landiak
aa3fca6daf Minor refactoring of caching 2023-04-11 09:26:08 +03:00
Andrii Landiak
3bc5aa88a3 Fix incorrect cache clearing on device delete 2023-04-11 09:09:54 +03:00
Andrii Landiak
1c909d570e Micro refactoring 2023-04-10 19:24:25 +03:00
Andrii Landiak
94b9e43aae Fix caching for deviceProfile provision key: no need to safe if null value cuz its crashes 2023-04-10 18:54:39 +03:00
Andrew Shvayka
e23a93d282
Merge pull request #8334 from thingsboard/improvements/notification-system 
Notification system improvements
 2023-04-10 15:07:22 +03:00
Andrew Shvayka
54e59612f6
Merge pull request #8254 from zzzeebra/optimization_dao_tests_with_cycles 
Optimization dao tests with cycles
 2023-04-10 14:02:30 +03:00
ViacheslavKlimov
25e1d73ca0 Merge branch 'develop/3.5' into improvements/notification-system 2023-04-10 10:22:41 +03:00
Andrii Landiak
e71f6bcc26 Refactoring x509 provisioning, fix tests 2023-04-10 09:35:32 +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
Andrii Landiak
7d4c1476a4 Refactoring: remove extra comments, remove spaces etc 2023-04-07 13:54:48 +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
ViacheslavKlimov
aef033b6c5 Fix for RemoteNotificationRuleProcessor 2023-04-07 13:14:23 +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
ViacheslavKlimov
20ec28b0c3 Merge branch 'develop/3.5' into improvements/notification-system 2023-04-06 18:46:06 +03:00
ViacheslavKlimov
24e2b525a4 Increase allowed notification template size 2023-04-06 18:45:54 +03:00
ViacheslavKlimov
788013c64a Local notification rules cache 2023-04-06 18:21:37 +03:00
ViacheslavKlimov
043bb253c7 New platform version notification 2023-04-06 14:18:12 +03:00
Andrii Shvaika
672c05d9b7 clear duplicated attribute keys before loading them from cache to avoid NPE 2023-04-06 12:59:29 +03:00
Andrew Shvayka
34e923422a
Merge pull request #8310 from adovh/bug/fix-1284-func-broken_in_case_E_numbers 
[3.5] fix for incorrect long integers, sent on ws to FE
 2023-04-06 12:45:51 +03:00
Andrew Shvayka
872a8f0c60
Merge branch 'develop/3.5' into feature/entity-usage 2023-04-06 12:12:49 +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
2e7c132919 improvements 2023-04-06 00:22:46 +02:00
YevhenBondarenko
5075152ce3 customer service improvements 2023-04-06 00:14:43 +02:00
YevhenBondarenko
059fad1421 merge with develop/3.5 2023-04-05 23:29:31 +02:00
YevhenBondarenko
22981e5e39 added count entity cache 2023-04-05 19:00:52 +02:00
YevhenBondarenko
60a4878ba7 improvements due to comments 2023-04-05 11:17:20 +02:00
AndriiD
54f472e436 added test for case when NumberFormatException is being thrown 2023-04-05 12:13:31 +03:00
ViacheslavKlimov
fccd60601f RemoteNotificationRuleProcessor 2023-04-04 15:05:56 +03: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
AndriiD
36b2c498df replaced long with BigInteger 2023-04-04 11:55:07 +03:00
dashevchenko
dc0e0bd068 merged with upstream 2023-04-04 11:22:29 +03:00
ViacheslavKlimov
d221cf1354 Slack rule node refactoring; default notification settings improvements 2023-04-03 20:20:46 +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