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

1376 Commits

Author SHA1 Message Date
Igor Kulikov
987d41f329 UI: Timeseries table basic config 2023-06-27 18:17:15 +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
Maksym Dudnik
cdb79bfc0c requested changes and internationalization fix 2023-06-27 12:05:32 +03:00
Artem Dzhereleiko
3e2b52b500 UI: refactoring style 2023-06-26 13:09:37 +03:00
Artem Dzhereleiko
e442ce6e1b UI: Refactoring 2023-06-26 12:46:25 +03:00
Maksym Dudnik
62fbb2d5cd mobile layout update 2023-06-23 15:51:50 +03:00
Artem Dzhereleiko
319e7fd09d UI: refactoring 2023-06-23 13:09:44 +03:00
Artem Dzhereleiko
06849452f4 UI: Added icon for rule chain selector 2023-06-23 13:08:32 +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
nickAS21
f534e2db64 fix_bug_switch: add validation to tbel mew msg 2023-06-12 13:05:10 +03:00
Maksym Dudnik
c5a35b1f53 6.12 update 2023-06-12 12:12:31 +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
Maksym Dudnik
ac0c7ed7b2 statistic number data fix 2023-06-09 16:00:32 +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
a48416e442 UI: Fixed process error in resource library component 2023-06-08 10:43:21 +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
Vladyslav_Prykhodko
1bde8d3dff UI: Added support js module resource in widget/action 2023-06-07 15:37:47 +03:00
Maksym Dudnik
82c546feb3 Merge branch 'develop/3.5.2' of https://github.com/thingsboard/thingsboard into gateway_list 
 Conflicts:
	ui-ngx/src/app/modules/common/modules-map.ts
 2023-06-07 12:20:09 +03:00
Maksym Dudnik
d15ec0dc39 hotfix 2023-06-07 11:27:05 +03:00
Igor Kulikov
16afbad9f2
Merge pull request #8638 from ArtemDzhereleiko/AD/imp/rule-chain-selector 
Rule chain selector
 2023-06-06 17:57:57 +03:00
Igor Kulikov
001b23b402
Merge pull request #8587 from vvlladd28/improvement/edit-notification-template 
Added the option to edit notification templates in the template selector
 2023-06-06 17:54:12 +03:00
Maksym Dudnik
c3cb3b4443 Merge branch 'develop/3.5.2' of https://github.com/thingsboard/thingsboard into gateway_list 
 Conflicts:
	ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts
	ui-ngx/src/app/shared/shared.module.ts
	ui-ngx/src/assets/locale/locale.constant-en_US.json
 2023-06-06 13:31:37 +03:00
Maksym Dudnik
c9b9959f47 mk2 gateway dashboard 2023-06-06 13:19:53 +03:00
dashevchenko
31cf975495 Merge remote-tracking branch 'upstream/develop/3.5.2' into resourcesByType 2023-06-06 12:42:47 +03:00
Artem Dzhereleiko
1f6e0e8271 UI: Refactoring 2023-06-05 15:26:48 +03:00
Artem Dzhereleiko
df9026e2df Merge remote-tracking branch 'upstream/develop/3.5.2' into AD/imp/rule-chain-selector 2023-06-05 15:14:46 +03:00
Artem Dzhereleiko
3df0d80242 Merge remote-tracking branch 'upstream/master' into AD/imp/rule-chain-selector 2023-06-05 15:05:39 +03:00
Artem Dzhereleiko
86c8ee6bde UI: Refactoring and add support edge rule chains 2023-06-05 15:05:01 +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
Andrew Shvayka
b758417a80
Merge pull request #8661 from kalutkaz/enrichmentRefactoringUI 
Enrichment refactoring UI
 2023-05-29 17:43:03 +03:00
Artem Dzhereleiko
92fa873215 UI: Fixed sort order rule chain 2023-05-29 17:38:23 +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
Igor Kulikov
79ced08ad6
Merge pull request #8641 from vvlladd28/bug/timewindow/incorrect-start-value 
Fixed setting time window initialization being called twice
 2023-05-26 17:12:06 +03:00
Vladyslav_Prykhodko
fdd6ebcb2c UI: Revert unnessery changes and change function order 2023-05-26 17:00:38 +03:00
Igor Kulikov
dbb5a8cc8b UI: Improve custom dialog error diagnostics. Improve widget error message formatting. 2023-05-26 16:45:29 +03:00
Artem Dzhereleiko
74897eea81 UI: Added help link for JWT security settings 2023-05-26 15:11:03 +03:00
Artem Dzhereleiko
4017692582 UI: Refactoring 2023-05-26 12:58:24 +03:00
Vladyslav_Prykhodko
ee91cc3033 UI: Refactoring code after review 2023-05-26 12:50:52 +03:00