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

2599 Commits

Author SHA1 Message Date
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
AndriiD
f95c64591e fixed pr comments 2023-05-15 11:52:05 +03:00
Igor Kulikov
0beb2d7033 Merge branch 'master' into develop/3.5.1 2023-05-12 15:43:22 +03:00
ViacheslavKlimov
5cec1b8af2 Ability to disable notification rule 2023-05-11 14:57:40 +03:00
ShvaykaD
fb164f0e24 merge with develop 3.5.1 2023-05-10 14:22:24 +03:00
AndriiD
7187fbb4d3 Replace object mapper usages with jackson utils 2023-05-10 14:10:58 +03:00
Andrii Shvaika
43674b7f29 Ignore a flaky test that is based on wrong cache strategy 2023-05-08 18:45:56 +03:00
Andrew Shvayka
1a366d476e
Revert "[3.5.1]Replace object mapper usages with jackson utils" 2023-05-08 14:54:21 +03:00
AndriiD
15d8b8ce91 Merge remote-tracking branch 'origin/develop/3.5.1' into replace_ObjectMapper_usages_with_JacksonUtil 2023-05-08 13:07:32 +03:00
ViacheslavKlimov
ead9d3be70 Merge with develop/3.5.1 2023-05-08 12:54:07 +03:00
AndriiD
93c219c83e renamed base controller/service tests 2023-05-04 16:43:13 +03:00
AndriiD
32e5d8561b Merge remote-tracking branch 'origin/develop/3.5.1' into replace_ObjectMapper_usages_with_JacksonUtil 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/SystemInfoController.java
#	dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ConfigTemplateServiceTest.java
#	rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNode.java
#	rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNode.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java
 2023-05-04 14:35:41 +03:00
Andrew Shvayka
86743b907a
Merge pull request #8464 from thingsboard/improvements/notification-system 
Notifications deduplication; upgrade improvements
 2023-05-04 12:47:03 +03:00
AndriiD
0e84fc1c6a removed redundant tests 2023-05-04 12:35:53 +03:00
Andrii Shvaika
08835a7245 Improvements to the activity stats reporting 2023-05-03 14:23:54 +03:00
Dmytro Skarzhynets
b612ab2f92 Fix: fix integration tests 2023-05-03 14:06:56 +03:00
ViacheslavKlimov
5f7ff55f01 Performance improvements for usage stats 2023-05-03 13:11:09 +03:00
YevhenBondarenko
fbf9773a61 optimize imports 2023-05-02 10:57:58 +02:00
YevhenBondarenko
40d6e67131 migrate to java 17 2023-05-02 00:46:34 +02:00
ViacheslavKlimov
a4281fd6d3 Deduplication for new platform version notification 2023-05-01 19:28:11 +03:00
Andrii Shvaika
df0bd28ae5 Fix Sparkplug tests 2023-05-01 13:37:17 +03:00
Andrii Shvaika
89efe12c45 Fix Equals And HashCode issue for Device/Asset/EntityView Info 2023-04-28 17:09:01 +03:00
AndriiD
73833a666b Merge branch 'develop/3.5' into replace_ObjectMapper_usages_with_JacksonUtil 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/action/EntityActionService.java
 2023-04-28 15:08:44 +03:00
ViacheslavKlimov
bf7454ad3c Move rate limiting to one service 2023-04-28 14:28:16 +03:00
Andrii Shvaika
7a385e34d1 DeviceInfo for Edge support 2023-04-28 14:27:17 +03:00
ViacheslavKlimov
c6ff49caf5 Try to fix testNotificationRequestsPerRuleRateLimits 2023-04-26 17:12:59 +03:00
ViacheslavKlimov
6e8ba8af13 Refactoring for alarms clean up; fix invalid total removed counting 2023-04-26 13:41:02 +03:00
YevhenBondarenko
ae93b42b60 added logs for wiggets bundle 2023-04-25 17:33:42 +02:00
ViacheslavKlimov
d1ef8c7fbb Fix notification target usage check on deletion 2023-04-25 14:37:58 +03:00
ViacheslavKlimov
0ce243f2e7 Merge with develop/3.5 2023-04-25 12:26:25 +03:00
ViacheslavKlimov
b71257ba23 User title template param, improve notification preview, improve default notifications 2023-04-24 15:47:00 +03:00
Andrew Shvayka
76f24827aa
Merge pull request #8398 from dashevchenko/newMessageTypes 
Added new message types to rule engine
 2023-04-24 15:00:33 +03:00
dashevchenko
62e9605971 renamed ALARM_ASSIGN to ALARM_ASSIGNED 2023-04-24 13:01:06 +03:00
ViacheslavKlimov
af49a6a0be Fix failing tests 2023-04-24 12:08:17 +03:00
ViacheslavKlimov
528d2d9ecc Track rule chains count 2023-04-20 18:54:31 +03:00
ViacheslavKlimov
97cc1ab0da Improve entities count limit notification rule 2023-04-20 18:23:38 +03:00
Andrew Shvayka
e19eaba01d
Merge pull request #8391 from YevhenBondarenko/features-info-improvements 
features info improvements
 2023-04-19 13:25:59 +03:00