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

1070 Commits

Author SHA1 Message Date
Igor Kulikov
840206ef57
Merge pull request #8882 from vvlladd28/feature/redesign/add-device-dialog-credentials 
Redesigned: Add device dialog
 2023-07-06 11:45:17 +03:00
Igor Kulikov
2fea229aa1 UI: Introduce borderRadius widget card setting. Improve widget style json field. 2023-07-06 11:02:15 +03:00
Igor Kulikov
4374b83b7f UI: Add reset option to alarm filter panel. 2023-07-05 18:19:22 +03:00
Artem Dzhereleiko
88b1bfc95b UI: User notification settings by notification type and remove slack 2023-07-05 13:19:29 +03:00
Igor Kulikov
c7823a26af UI: Alarms table widget basic config. 2023-07-04 19:58:55 +03:00
Vladyslav_Prykhodko
b781a05764 UI: Redesign device wizard and device credentias 2023-07-04 18:02:11 +03:00
rusikv
552be228a3 Refactoring 2023-07-03 17:13:11 +03:00
rusikv
2cc6f803af Merge remote-tracking branch 'upstream/develop/3.5.2' into feature/test-rulenode-script-function-with-selected-event 2023-07-03 15:58:30 +03:00
Igor Kulikov
c1b83cb276
Merge pull request #8834 from ChantsovaEkaterina/bug/widget-data-not-loading-for-particular-timewindow-intervals 
Fixed loading widget data for 'previous quarter' and 'previous half year' timewindow intervals
 2023-06-28 13:21:03 +03:00
Vladyslav_Prykhodko
c870e03eb2 UI: Hide alarm style in notification when alarm cleared 2023-06-27 17:36:20 +03:00
rusikv
95878afcfb Test rule node script function with selected event implementation 2023-06-27 17:30:56 +03:00
Chantsova Ekaterina
bb59a50b60 UI: fixed loading widget data for 'previous quarter' and 'previous half year' timewindow intervals 2023-06-27 17:23:45 +03:00
ViacheslavKlimov
0f078b0da2 SNMP traps support 2023-06-26 15:04:31 +03:00
Artem Dzhereleiko
8dcd32e4b3 UI: User notification settings 2023-06-26 10:44:07 +03:00
Igor Kulikov
1ec37d7685 UI: Improve data keys config. Fix datasource type processing. 2023-06-20 18:52:13 +03:00
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
Vladyslav_Prykhodko
7dd5cada35 UI: Refactoring and fix notification delivery method in mobile 2023-06-12 18:16:24 +03:00
ViacheslavKlimov
3150580dce Merge branch 'develop/3.5.2' into feature/push-notifications 
# Conflicts:
#	application/pom.xml
#	pom.xml
 2023-06-12 14:12:19 +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