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

616 Commits

Author SHA1 Message Date
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
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
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
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
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
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
kalytka
d132d800c7 UI refactoring 2023-05-26 10:50:32 +03:00
Vladyslav_Prykhodko
fa8decd293 UI: Fixed timewindows writeValue is being called twice, first time with a phantom null value 2023-05-25 17:38:26 +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
Artem Dzhereleiko
3443319c61 UI: Rule chain selector 2023-05-25 13:49:04 +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
Andrii Shvaika
193b37e292 Merge with master 2023-05-24 18:40:57 +03:00
Andrew Shvayka
d33d968aa9
Merge pull request #8605 from deaflynx/fix/prod-1975/edit-json-validation 
Fixed JSON value validations when editing in dialog
 2023-05-24 18:00:27 +03:00
ShvaykaD
1929908e3d Merge branch 'develop/3.5.1' into feature/enrichment-rule-nodes-improvements 2023-05-23 16:10:23 +03:00
Igor Kulikov
1659257f74 Merge branch 'develop/3.5.2' into feature/widget-config 2023-05-23 09:40:01 +03:00
Andrii Shvaika
b322ef449a Merge remote-tracking branch 'origin/master' into develop/3.5.2 2023-05-22 18:03:48 +03:00
Igor Kulikov
e797880280
Merge pull request #8600 from vvlladd28/bug/file-input/browse-file-buttton 
Fix handle action "browser file" in file input components
 2023-05-22 17:52:17 +03:00
Igor Kulikov
2710772cee
Merge pull request #8578 from ArtemDzhereleiko/AD/bug-fix/custom-translate-alarm-type 
Custom translate for alarm type
 2023-05-22 17:50:56 +03:00
Vladyslav_Prykhodko
a2693238c6 UI: Fix handle action "browser file" in file input components 2023-05-22 17:37:00 +03:00
Igor Kulikov
26562afbdb Merge branch 'develop/3.5.1' into feature/widget-config 2023-05-22 15:52:15 +03:00
Igor Kulikov
f1db4c44c3 Merge branch 'master' into develop/3.5.1 2023-05-22 15:50:52 +03:00
Igor Kulikov
21a49ff2d5 UI: Angular 15 migration fix 2023-05-22 15:48:20 +03:00
Vladyslav_Prykhodko
e8c57c9d5a UI: Added allow edit notification template in template selector 2023-05-19 18:01:37 +03:00
Igor Kulikov
130bb84657 UI: Widget config improvement 2023-05-19 17:54:27 +03:00
Artem Dzhereleiko
17f34a9bca UI: Refactoring 2023-05-19 11:17:16 +03:00
Artem Dzhereleiko
5509b93cc8 UI: Add custom translate for notification message 2023-05-19 11:16:12 +03:00
Artem Dzhereleiko
733a2a03e4 UI: Custom translate for alarm type 2023-05-19 10:55:19 +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
Igor Kulikov
600d6cf27c UI: Widget config improvements 2023-05-16 20:00:53 +03:00
Igor Kulikov
eb7ecca827 UI: Improve dashboard edit panel. 2023-05-15 15:15:55 +03:00
Vladyslav_Prykhodko
9c393dccba UI: Fixed queue autocomplete class name and code syle 2023-05-09 11:12:58 +03:00
deaflynx
9ef743b85b Merge remote-tracking branch 'origin/master' into fix/prod-1975/edit-json-validation 2023-05-08 18:20:05 +03:00
deaflynx
c303d4dea3 Fix PROD-1975: ValueInputComponent change: add updateView() after closing openEditJSONDialog 2023-05-08 17:54:27 +03:00
Vladyslav_Prykhodko
ffa481d780 UI: Fixed size notification action button; added validation button text length 2023-05-08 11:20:37 +03:00