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

5553 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
Andrew Shvayka
e30cf55988
Merge pull request #8723 from dashevchenko/mailConfigTemplates 
Mail config templates, oauth2 protocol for mail server
 2023-06-09 16:05:43 +03:00
dashevchenko
9d57be98bf refactoring 2023-06-09 13:06:40 +03:00
dashevchenko
44c784c248 refactoring 2023-06-08 18:37:06 +03:00
ViacheslavKlimov
b77078c24e Notifications deduplication improvements 2023-06-08 18:15:56 +03:00
Andrii Shvaika
59d21eb9d7 Simplify permission check 2023-06-08 17:59:08 +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
1025842668 fixed license 2023-06-08 16:18:45 +03:00
dashevchenko
a85f5b4330 added initial implementation 2023-06-08 12:30:35 +03:00
ShvaykaD
8b5fe7845b Merge branch 'develop/3.5.2' of github.com:thingsboard/thingsboard into feature/rpc-response-handling-improvements 2023-06-07 16:02:45 +03:00
Andrii Shvaika
aa6a136ef8 Merge remote-tracking branch 'origin/fixes/notification-system' into develop/3.5.2 2023-06-07 16:02:30 +03:00
ShvaykaD
7ee861d55c removed unused methods and variables 2023-06-07 15:55:47 +03:00
Vladyslav_Prykhodko
2be9a1e1c3 Merge remote-tracking branch 'upstream/develop/3.5.2' into dashevchenko-resourcesByType 2023-06-07 15:40:44 +03:00
dashevchenko
87786ef72d refactoring 2023-06-07 15:27:44 +03:00
ShvaykaD
9899b8d9f4 reverted logic to set RPC status SUCCESSFUL even if it undelivered 2023-06-07 15:24:33 +03:00
Andrew Shvayka
7bb8f8732c
Merge pull request #8682 from AndriiLandiak/feature/redis-sentinel 
[3.5.2] Redis Sentinel support
 2023-06-07 15:24:18 +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
407effbc26 refactoring 2023-06-07 14:08:55 +03:00
dashevchenko
06dd204465 refactoring 2023-06-07 13:38:47 +03:00
dashevchenko
29384170d7 added tests 2023-06-07 13:16:55 +03:00
dashevchenko
f356a94b81 added new hash_code column to resource table 2023-06-07 00:06:55 +03:00
Igor Kulikov
d992355a3c UI: Implement basic config form for Entities table widget. 2023-06-06 17:20:35 +03:00
ShvaykaD
d500d5cb17 updated RPC based logs to use RPC keyword instead of rpc 2023-06-06 14:30:02 +03:00
ShvaykaD
509e630439 fix log typo 2023-06-06 13:29:17 +03:00
ShvaykaD
3955c2f018 fixed rpc queue stuck issue & improvements to rpc logging 2023-06-06 13:24:12 +03:00
dashevchenko
31cf975495 Merge remote-tracking branch 'upstream/develop/3.5.2' into resourcesByType 2023-06-06 12:42:47 +03:00
dashevchenko
051c7c384d added etag header for resources/{id}/download endpoint 2023-06-06 11:52:08 +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
f5cd8a9a52 Notification system - less async operations 2023-06-02 14:57:00 +03:00
ViacheslavKlimov
67656a2757 Notifications deduplication 2023-06-02 14:50:23 +03:00
Igor Kulikov
4ab93c8c52 Merge branch 'develop/3.5.2' into feature/widget-config 2023-06-02 13:15:45 +03:00
Andrew Shvayka
4311b2f030
Merge pull request #8640 from thingsboard/delete_search_text_ce 
Remove deprecated search text field
 2023-06-02 12:01:07 +03:00
Andrii Shvaika
8ab5e1a2db Merge remote-tracking branch 'origin/master' into develop/3.5.2 2023-06-01 15:33:58 +03:00
Andrii Shvaika
be41ec8bef Fix minor issues. Merged with develop/3.5.2 2023-06-01 15:10:08 +03:00
Andrii Landiak
c2a87aba60 Add redis-sentinel mode support 2023-06-01 14:47:47 +03:00
Andrii Shvaika
d09dba8fcb Merge remote-tracking branch 'origin/delete_search_text_ce' into develop/3.5.2 2023-06-01 13:04:14 +03:00
Igor Kulikov
733dcea36a Update UI help branch 2023-05-31 12:56:50 +03:00
Igor Kulikov
eebfb5d0a4 Merge branch 'develop/3.5.2' into feature/widget-config 2023-05-30 18:47:56 +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
3e332d9194 Merge with develop/3.5.2 2023-05-30 17:03:24 +03:00