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

785 Commits

Author SHA1 Message Date
Igor Kulikov
0032490a19 Merge with develop/3.5 2023-04-21 18:45:44 +03:00
Igor Kulikov
14c61f65e9 UI: Alarm count datasource type support. Improve alarm filters. 2023-04-21 18:00:56 +03:00
Vladyslav_Prykhodko
0ee7dff7b4 UI: Added catch error when parsing incorrect debug message in rule node 2023-04-21 11:06:04 +03:00
Igor Kulikov
7d2cce65d9 UI: Implement recent dashboards widget 2023-04-19 13:55:51 +03:00
Igor Kulikov
263b804dca UI: Implement quick links widget 2023-04-18 13:45:47 +03:00
Igor Kulikov
8b0931e02a UI: Tenant admin home page 2023-04-17 19:09:23 +03:00
Igor Kulikov
ac08bb7921 UI: Sys admin home page mobile layout 2023-04-13 12:59:01 +03:00
Igor Kulikov
47909088f0 Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into feature/home-page 2023-04-12 16:43:54 +03:00
Andrew Shvayka
b952360055
Merge pull request #8026 from volodymyr-babak/filter-type-multiple-types 
Filter type alias - add possibility to specify multiple types, instead of single one
 2023-04-11 17:26:29 +03:00
Igor Kulikov
1b952f2a71 Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into feature/home-page 2023-04-10 16:11:04 +03:00
Igor Kulikov
855c69e0d6 UI: Update sys admin home page. Add translations. 2023-04-10 16:10:44 +03:00
Andrew Shvayka
8769911694
Merge pull request #8256 from imbeacon/fix/alarm-assignment-user-issues 
Added getting user list for alarm assignment and ability to assign alarms for customer users
 2023-04-07 15:00:22 +03:00
Igor Kulikov
fb06d2fe77 UI: Sys Admin Home Page: Documentation links widget 2023-04-05 19:37:14 +03:00
Igor Kulikov
92b5b2ee85 UI: Sys Admin home page 2023-04-05 16:31:39 +03:00
Vladyslav_Prykhodko
ef94a8c198 UI: Add new rule node and refactoring code 2023-04-04 18:08:44 +03:00
Vladyslav_Prykhodko
f4de754202 UI: Add tenant admin notification settings 2023-04-03 17:39:58 +03:00
Volodymyr Babak
0fb40c8a2d Merge remote-tracking branch 'upstream/develop/3.5' into filter-type-multiple-types 2023-04-03 13:48:04 +03:00
imbeacon
3133775901 Merge remote-tracking branch 'upstream/develop/3.5' into fix/alarm-assignment-user-issues 2023-03-31 17:40:34 +03:00
Igor Kulikov
fddb7708ca UI: Update to latest Angular 15 version. Update filled text field style. Fix menu for customer: remove redudand dashboard section. 2023-03-30 16:30:40 +03:00
Vladyslav_Prykhodko
f3b538d6a9 UI: Fixed navigatePrevState and updated help template 2023-03-30 12:21:20 +03:00
imbeacon
2bd6a29ca4 Merge remote-tracking branch 'upstream/develop/3.5' into fix/alarm-assignment-user-issues 2023-03-30 09:28:45 +03:00
Igor Kulikov
97b16ea6fd
Merge pull request #8269 from ChantsovaEkaterina/improvement/originator-label-in-alarm-widget-actions 
Add originator label in alarm widget actions
 2023-03-28 19:55:37 +03:00
Igor Kulikov
599fe41d85
Merge pull request #8255 from kalutkaz/deleteIcon 
Added "delete" icon to the default icon list
 2023-03-28 19:46:08 +03:00
Igor Kulikov
c7c6f2cbc9
Merge pull request #8071 from engix-ltd/base64_api 
Add Base64 functions to Utils service.
 2023-03-28 19:29:27 +03:00
Chantsova Ekaterina
09bae92b86 UI: Add originator label in alarm widget actions 2023-03-27 18:32:29 +03:00
imbeacon
1283217b4b Merge remote-tracking branch 'upstream/develop/3.5' into fix/alarm-assignment-user-issues 2023-03-27 09:55:22 +03:00
Vladyslav_Prykhodko
f1fb7d631e UI: Fixed ws in notification 2023-03-24 16:59:51 +02:00
Vladyslav_Prykhodko
eea6e5a5e6 Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system 2023-03-24 13:42:44 +02:00
Vladyslav_Prykhodko
4ae7cd81c4 UI: Move rule chains menu link in top level 2023-03-24 12:41:06 +02:00
zbeacon
32b1bf900d Refactoring and added method to get users for assignment to rest client 2023-03-24 10:39:58 +02:00
zbeacon
ba6a83e575 Added getting users for assignment 2023-03-23 21:09:42 +02:00
kalytka
9e2d2e980c Added "delete" icon to the default icon list 2023-03-23 17:21:57 +02:00
Vladyslav_Prykhodko
daa73dbf53 Merge remote-tracking branch 'klimov/feature/notification-system' into feature/notification-system 2023-03-22 18:22:13 +02:00
Vladyslav_Prykhodko
894b992196 UI: Add allow delete notification and request notification 2023-03-22 17:08:10 +02:00
Vladyslav_Prykhodko
fa1a5f086f UI: Minor change in notification 2023-03-22 11:53:29 +02:00
Vladyslav_Prykhodko
d4547ade3d UI: Fixed after merge develop/3.5 2023-03-21 17:56:12 +02:00
Vladyslav_Prykhodko
1b2b84e48e Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system 2023-03-21 15:32:23 +02:00
Igor Kulikov
1dc78d361f UI: Improve menu sections height calculation. Improve entities table border. 2023-03-21 13:09:20 +02:00
Igor Kulikov
1e47d5b3ff UI: Minor improvements 2023-03-21 12:19:37 +02:00
Vladyslav_Prykhodko
d66d882a0c UI: Add new function in tenant profiles service 2023-03-20 15:07:28 +02:00
Vladyslav_Prykhodko
615e4a2865 UI: Add new notiifcation target 2023-03-17 16:35:34 +02:00
Igor Kulikov
fde346d8e4 UI: Router tabs improvements. Improve entities table to watch router data changes. 2023-03-16 13:07:10 +02:00
Igor Kulikov
926c364575 UI: Router tabs component improvements. Remove alarm rules page. 2023-03-10 14:58:16 +02:00
Igor Kulikov
0780669498 Merge with develop/3.5 2023-03-10 12:56:00 +02:00
ViacheslavKlimov
8fcbe876e8 Merge branch 'develop/3.5' into feature/notification-system 
# Conflicts:
#	pom.xml
 2023-03-08 18:16:16 +02:00
Igor Kulikov
4972d0f43e UI: Map widgets -> reset map state when subscription changed (alias or key filters). 2023-03-08 17:14:44 +02:00
ViacheslavKlimov
a56261ac9d Merge with develop/3.5 2023-03-08 13:11:31 +02:00
Andrew Shvayka
6cc8b8e6a8
Merge pull request #8098 from thingsboard/feature/alarm-assign 
Alarm assignment to users
 2023-03-08 11:06:55 +02:00
Igor Kulikov
43783f0379 UI: Markdown component and markdown widget style improvements 2023-03-07 18:25:15 +02:00
Andrii Shvaika
c9b37237c1 Merge with develop/3.5 2023-03-07 16:21:57 +02:00