1002 Commits

Author SHA1 Message Date
Andrew Shvayka
7258c5de73
Merge pull request #8702 from thingsboard/feature/exceeded-rate-limits-notifications
Notifications about exceeded rate limits
2023-06-13 17:40:45 +03:00
Andrii Shvaika
4abf7ccd5a Merge with master 2023-06-13 17:18:32 +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
Andrii Shvaika
997b915905 Merge with develop/3.5.2 2023-06-13 11:30:29 +03:00
nickAS21
f534e2db64 fix_bug_switch: add validation to tbel mew msg 2023-06-12 13:05:10 +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
nickAS21
a85d0b6129 fix_bug_switch: add validation to tbel 2023-06-09 15:13:33 +03:00
dashevchenko
a85f5b4330 added initial implementation 2023-06-08 12:30:35 +03:00
Vladyslav_Prykhodko
1bde8d3dff UI: Added support js module resource in widget/action 2023-06-07 15:37:47 +03:00
dashevchenko
31cf975495 Merge remote-tracking branch 'upstream/develop/3.5.2' into resourcesByType 2023-06-06 12:42:47 +03:00
Vladyslav_Prykhodko
4dbe1cf004 UI: Add support new notification rule Rate limits and improve string items list 2023-06-05 11:13:29 +03:00
ViacheslavKlimov
d5d087d826 UI part and help page for exceeded rate limits notification rule 2023-06-02 15:09:35 +03:00
Igor Kulikov
3e332d9194 Merge with develop/3.5.2 2023-05-30 17:03:24 +03:00
Igor Kulikov
11b49146ce Merge with master 2023-05-30 17:01:30 +03:00
Igor Kulikov
2bbd3d1107
Merge pull request #8654 from ArtemDzhereleiko/AD/imp/help/jwt-security-settings
Added help link for JWT security settings
2023-05-30 15:01:59 +03:00
Igor Kulikov
36f1cd00e7 Merge with develop/3.5.2 2023-05-26 18:00:04 +03:00
Igor Kulikov
5c6651fca1 Merge with master 2023-05-26 17:54:26 +03:00
Vladyslav_Prykhodko
fdd6ebcb2c UI: Revert unnessery changes and change function order 2023-05-26 17:00:38 +03:00
Artem Dzhereleiko
74897eea81 UI: Added help link for JWT security settings 2023-05-26 15:11:03 +03:00
Vladyslav_Prykhodko
ee91cc3033 UI: Refactoring code after review 2023-05-26 12:50:52 +03:00
Igor Kulikov
ee159be366 UI: Introduce device datasource type. Implement basic and advanced widget config modes. 2023-05-25 17:03:52 +03:00
Andrii Shvaika
1de437b1e6 Merge with develop/3.5.2 2023-05-25 12:25:51 +03:00
Igor Kulikov
7c6c7e5f67 Merge branch 'develop/3.5.2' into feature/widget-config 2023-05-24 19:14:15 +03:00
kalytka
5f32f9c51b Added configurationVersion to ruleNodes 2023-05-24 12:13:01 +03:00
ViacheslavKlimov
508a990ab1 Merge remote-tracking branch 'origin/develop/3.5.2' into feature/notification-configs-vc 2023-05-23 15:20:21 +03:00
Vladyslav_Prykhodko
b41fa03d24 UI: Added new resource type JS module 2023-05-19 19:23:21 +03:00
Igor Kulikov
8ae1b1b2e1 Merge branch 'develop/3.5.1' into feature/widget-config 2023-05-19 17:55:36 +03:00
ShvaykaD
f0bf244f34 merge with develop/3.5.1 2023-05-19 17:23:28 +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
Viacheslav Klimov
e3646c9ea9
Merge branch 'develop/3.5.1' into feature/notification-configs-vc 2023-05-19 15:40:48 +02:00
Vladyslav_Prykhodko
70450fc874 UI: Improved notification version 2023-05-19 16:07:08 +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
f88df355c1 Merge remote-tracking branch 'upstream/develop/3.5.1' into smsDisabledFlag 2023-05-17 17:08:25 +03:00
Igor Kulikov
600d6cf27c UI: Widget config improvements 2023-05-16 20:00:53 +03:00
dashevchenko
a6c52809cd added sms disabled feature for tenant profile configuration 2023-05-16 15:04:39 +03:00
nickAS21
5f515c8905 tbel: ffix bug, Incorrect validation syntax with null field property 2023-05-16 14:40:49 +03:00
ViacheslavKlimov
97141efd5d UI for notification configs VC 2023-05-12 14:56:16 +03:00
ViacheslavKlimov
5cec1b8af2 Ability to disable notification rule 2023-05-11 14:57:40 +03:00
Igor Kulikov
e4bd615b82
Merge pull request #8438 from ChantsovaEkaterina/feature/custom-action-extension-module-support
Widget extension module support in custom action
2023-05-02 13:25:12 +03:00
Andrii Shvaika
6bf957cc5b Merge branch 'feature/sparkplug-shared-attributes' 2023-05-01 13:18:45 +03:00
Igor Kulikov
c11ff1434d UI: Display device activity state in table. Implement device activity state filter. 2023-04-28 16:30:41 +03:00
Andrii Shvaika
8e20fd8800 Metric wildcards and default attributes 2023-04-27 17:08:34 +03:00
Andrew Shvayka
f6f15773fb
Merge pull request #8428 from vvlladd28/bug/help-link/resource
Fix help link for resources
2023-04-27 12:35:56 +03:00
Chantsova Ekaterina
330137d20e Merge remote-tracking branch 'upstream/master' into feature/custom-action-extension-module-support 2023-04-27 10:56:40 +03:00
Vladyslav_Prykhodko
2a41e24173 UI: Fix help map key 2023-04-27 10:23:03 +03:00
Igor Kulikov
19e473f35b
Merge pull request #8424 from vvlladd28/improvement/notification/disable-method
Navigation to particular delivery method settings from the "New notification" window
2023-04-26 18:28:55 +03:00
Igor Kulikov
6a1fc164cd
Merge pull request #8416 from ArtemDzhereleiko/AD/imp/help-for-notification
Help button for notifications dialog
2023-04-26 18:24:20 +03:00
Igor Kulikov
b7ebd07976
Merge pull request #8396 from thingsboard/tbel_vcalidator
Fixed validation of the TBEL "foreach" loop in the "Script fuction" UI component
2023-04-26 18:21:28 +03:00