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
ViacheslavKlimov
0bd7f74c47 Fix issues 2023-06-13 14:12:54 +03:00
ViacheslavKlimov
f98eee5407 Merge branch 'develop/3.5.2' into feature/exceeded-rate-limits-notifications 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
#	application/src/main/resources/thingsboard.yml
#	application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
#	dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotifications.java
#	ui-ngx/src/app/modules/common/modules-map.ts
 2023-06-13 13:49:51 +03:00
Andrew Shvayka
7d31d25aa0
Merge pull request #8729 from thingsboard/fixes/notification-system 
Notifications deduplication improvements
 2023-06-13 12:25:07 +03:00
Andrii Shvaika
997b915905 Merge with develop/3.5.2 2023-06-13 11:30:29 +03:00
ViacheslavKlimov
39d7498c59 Merge branch 'develop/3.5.2' into fixes/notification-system 2023-06-12 21:37:21 +03:00
Andrew Shvayka
dd900dafba
Merge pull request #8713 from ShvaykaD/feature/rpc-response-handling-improvements 
RPC queue stuck issue on response handling for undelivered rpc && logging improvements
 2023-06-12 13:42:59 +03:00
ViacheslavKlimov
b77078c24e Notifications deduplication improvements 2023-06-08 18:15:56 +03:00
Andrii Shvaika
d34a65eada Resources access for Customer Users 2023-06-08 17:44:20 +03:00
Andrii Shvaika
1b15e78985 Merge branch 'resourcesByType' of github.com:dashevchenko/thingsboard into develop/3.5.2 2023-06-08 16:37:10 +03:00
dashevchenko
87786ef72d refactoring 2023-06-07 15:27:44 +03:00
ShvaykaD
138128d837 added more logs to RPC processing logic in MQTT and CoAP transports 2023-06-07 15:18:45 +03:00
dashevchenko
29384170d7 added tests 2023-06-07 13:16:55 +03:00
dashevchenko
31cf975495 Merge remote-tracking branch 'upstream/develop/3.5.2' into resourcesByType 2023-06-06 12:42:47 +03:00
ViacheslavKlimov
f2684e124d Fix AlarmCommentControllerTest 2023-06-02 18:20:15 +03:00
ViacheslavKlimov
2f560315d1 Exceeded rate limits notifications; their deduplication; refactoring 2023-06-02 15:09:09 +03:00
ViacheslavKlimov
184a554d08 More tests for notification rules; fix unstable tests 2023-06-02 15:00:03 +03:00
ViacheslavKlimov
64571eeff2 Don't use Rule Engine message as notification rule trigger 2023-06-02 14:58:12 +03:00
ViacheslavKlimov
67656a2757 Notifications deduplication 2023-06-02 14:50:23 +03:00
Igor Kulikov
ceda0f14e6 Merge branch 'master' into develop/3.5.2 2023-05-30 18:47:33 +03:00
Andrew Shvayka
1183195d23
Merge pull request #8611 from YevhenBondarenko/cookie-util-improvements 
ser/des in json format
 2023-05-30 17:10:05 +03:00
Igor Kulikov
11b49146ce Merge with master 2023-05-30 17:01:30 +03:00
Andrii Shvaika
11b6e8ebd0 Merge branch 'master' of github.com:thingsboard/thingsboard 2023-05-30 14:52:06 +03:00
Andrii Shvaika
29602c208e Fix MQTT connection tests according to specification 2023-05-30 14:51:54 +03:00
AndriiD
c863cf6c15 \changed ServiceType.valueOf to ServiceType.of 2023-05-29 20:24:13 +03:00
Andrii Shvaika
adcf23cabb Improved the procedure of rule node update 2023-05-25 17:13:59 +03:00
Andrii Shvaika
1de437b1e6 Merge with develop/3.5.2 2023-05-25 12:25:51 +03:00
ViacheslavKlimov
597696eabc Try to fix testNotificationRuleDisabling 2023-05-24 13:12:33 +03:00
ShvaykaD
1929908e3d Merge branch 'develop/3.5.1' into feature/enrichment-rule-nodes-improvements 2023-05-23 16:10:23 +03:00
YevhenBondarenko
4f28a45c88 ser/des in json format 2023-05-23 13:59:24 +02:00
Andrii Shvaika
bf63eaccfe Merge branch 'master' into develop/3.5.2 2023-05-22 17:50:05 +03:00
Igor Kulikov
f1db4c44c3 Merge branch 'master' into develop/3.5.1 2023-05-22 15:50:52 +03:00
Andrew Shvayka
7e1d06b3cd
Merge pull request #8456 from thingsboard/improvements/rate-limits 
Rate limits improvements
 2023-05-22 15:25:30 +03:00
dashevchenko
9b461272c4 fixed xxe vulnerability 2023-05-22 13:11:14 +03:00
dashevchenko
7e7b5b17e7 refactoring 2023-05-19 17:32:17 +03:00
ShvaykaD
f0bf244f34 merge with develop/3.5.1 2023-05-19 17:23:28 +03:00
Andrew Shvayka
da9bea1f20
Merge pull request #8519 from adovh/replace_ObjectMapper_usages_with_JacksonUtil 
[3.5.1]Replace object mapper usages with jackson utils
 2023-05-19 17:07:16 +03:00
Andrew Shvayka
27c88e914d
Merge pull request #8556 from dashevchenko/smsDisabledFlag 
Added feature to disable sms messaging
 2023-05-19 16:51:43 +03:00
ViacheslavKlimov
3cdd293173 Merge with develop/3.5.1 2023-05-19 14:21:21 +03:00
ShvaykaD
97a39729f3 fixed testSaveRuleChainMetadataWithVersionedNodes test 2023-05-19 14:16:54 +03:00
Vladyslav_Prykhodko
31858ea48e Merge remote-tracking branch 'upstream/develop/3.5.1' into feature/notification-rules-disabling 2023-05-19 13:51:57 +03:00
ShvaykaD
b8eb239c39 Merge branch 'develop/3.5.1' of github.com:thingsboard/thingsboard into feature/enrichment-rule-nodes-improvements 2023-05-18 18:57:26 +03:00
ShvaykaD
cfcf539c50 added upgrade logic tests && added fixes for review comments 2023-05-18 18:55:00 +03:00
dashevchenko
49c230c815 refactoring 2023-05-18 17:58:45 +03:00
YevhenBondarenko
bdbc04e800 merge with develop/3.5.1 2023-05-18 11:04:05 +02:00
YevhenBondarenko
e3b9099bb1 fixed cookie deserialization vulnerability 2023-05-17 20:46:59 +02:00
dashevchenko
d966367623 fixed tests 2023-05-17 17:07:32 +03:00
dashevchenko
b083ab98e0 updated GET /resources api to filter resources by type 2023-05-17 15:10:57 +03:00
ViacheslavKlimov
ce83ee4444 Merge remote-tracking branch 'origin/develop/3.5.1' into improvements/rate-limits 
# Conflicts:
#	application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
 2023-05-17 12:28:51 +03:00
ViacheslavKlimov
2483c89055 Merge remote-tracking branch 'origin/develop/3.5.1' into improvements/rate-limits 2023-05-17 12:28:24 +03:00
dashevchenko
a6c52809cd added sms disabled feature for tenant profile configuration 2023-05-16 15:04:39 +03:00