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

3260 Commits

Author SHA1 Message Date
ViacheslavKlimov
20ec28b0c3 Merge branch 'develop/3.5' into improvements/notification-system 2023-04-06 18:46:06 +03:00
Igor Kulikov
474130f401 UI: Home page responsive 2023-04-06 17:54:08 +03:00
rusikv
bcee982497 Merge remote-tracking branch 'upstream/develop/3.5' into alarm-details-redesign 2023-04-06 16:08:38 +03:00
ViacheslavKlimov
043bb253c7 New platform version notification 2023-04-06 14:18:12 +03:00
Igor Kulikov
1ff37dfe73 UI: Doc links widget 2023-04-06 13:52:38 +03:00
Vladyslav_Prykhodko
0bdae38d1d UI: Fixed updated notification when open notifications popover 2023-04-06 13:29:04 +03:00
Illia Barkov
ae35b45799
Merge branch 'develop/3.5' into fix/alarm-assignment-user-issues 2023-04-06 10:52:57 +03:00
Igor Kulikov
fb06d2fe77 UI: Sys Admin Home Page: Documentation links widget 2023-04-05 19:37:14 +03:00
Vladyslav_Prykhodko
89362dedf1 UI: Add filter entity type for notification rule 2023-04-05 17:42:14 +03:00
Igor Kulikov
92b5b2ee85 UI: Sys Admin home page 2023-04-05 16:31:39 +03:00
Vladyslav_Prykhodko
3279b27b73 UI: Fixed minor style in notification 2023-04-05 16:12:36 +03:00
Vladyslav_Prykhodko
2baf5c81e5 UI: Fixed minor style in notification 2023-04-05 15:47:55 +03:00
Igor Kulikov
f10113f20c Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into feature/home-page 2023-04-05 15:46:42 +03:00
Vladyslav_Prykhodko
51c5ae2dcc Merge branch 'improvements/notification-system' of github.com:thingsboard/thingsboard into improvements/notification-system 2023-04-05 15:36:59 +03:00
Vladyslav_Prykhodko
11d6df96d1 UI: Fixed slack autocomplete and refactroing code 2023-04-05 15:36:36 +03:00
ViacheslavKlimov
0f8a3048a7 Merge branch 'develop/3.5' into improvements/notification-system 2023-04-05 14:10:16 +03:00
nickAS21
19e58193b5 sparkplug: change locale 2023-04-05 13:32:57 +03:00
Vladyslav_Prykhodko
ef94a8c198 UI: Add new rule node and refactoring code 2023-04-04 18:08:44 +03:00
Igor Kulikov
6041796e7c UI: Sys Admin Home Page 2023-04-04 17:27:00 +03:00
Vladyslav_Prykhodko
c4bb1d8476 Merge remote-tracking branch 'upstream/develop/3.5' into improvements/notification-system 2023-04-04 12:52:24 +03:00
Vladyslav_Prykhodko
193c1d0306 UI: Fix disable time interval in timewindow panel 2023-04-04 12:37:24 +03:00
Andrew Shvayka
28a90e965a
Merge pull request #8274 from volodymyr-babak/edge-alarm-id 
[3.5] Alarm entity that was delivered from the edge is stored with provided ID
 2023-04-04 12:19:39 +03:00
dashevchenko
dc0e0bd068 merged with upstream 2023-04-04 11:22:29 +03:00
Igor Kulikov
6421f6596b UI: Implement Sys Admin home page 2023-04-03 19:39:28 +03:00
ViacheslavKlimov
cd50eabd40 Notification rule node; refactoring 2023-04-03 19:02:23 +03:00
Vladyslav_Prykhodko
4e8e33ca1c UI: Fix after change slack 2023-04-03 18:01:15 +03:00
Vladyslav_Prykhodko
10c279fe0e Merge branch 'improvements/notification-system' of github.com:thingsboard/thingsboard into improvements/notification-system 2023-04-03 17:40:53 +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
ViacheslavKlimov
dc3ca22e63 Slack recipients preview and recipient params; refactoring 2023-04-03 12:21:09 +03:00
Vladyslav_Prykhodko
27595dc1b7 UI: Disables the ability for the user to interact with the tooltip element 2023-04-03 11:17:36 +03:00
kalytka
1d2368e98f Refactoring 2023-04-03 11:03:58 +03:00
Vladyslav_Prykhodko
299c159ca1 UI: Fixed minnor bug in notification system 2023-03-31 18:54:17 +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
rusikv
089942ae31 Add exoprt of alarm activity in CSV format 2023-03-31 15:35:25 +03:00
kalytka
6202832d8c Refactoring 2023-03-31 14:57:10 +03:00
kalytka
e2114f49c0 Added parsing to the point tooltip, Update parsing HTML forms 2023-03-31 13:14:20 +03:00
Vladyslav_Prykhodko
8874dfa35a Merge remote-tracking branch 'upstream/develop/3.5' into improvements/notification-system 2023-03-31 12:50:46 +03:00
rusikv
87067401be Merge remote-tracking branch 'upstream/develop/3.5' into alarm-details-redesign 2023-03-31 12:04:13 +03:00
kalytka
bcfab48a79 Added label parsing in select entity dialog 2023-03-31 11:30:33 +03:00
Igor Kulikov
75e9e45321 UI: Improve filled text field style 2023-03-30 20:17:53 +03:00
Igor Kulikov
ad8a9380fd UI: Fix notification typings 2023-03-30 18:31:55 +03:00
Igor Kulikov
9660a93bd9 UI: Improve filled text field style. Improve scrollbar style. 2023-03-30 18:15:38 +03:00
Chantsova Ekaterina
b40ca785e0 Update links for alarm info in widget custom action help 2023-03-30 18:13:17 +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
Igor Kulikov
f8a1615582
Merge pull request #8287 from vvlladd28/feaure/map/here/version-3 
API version 3 support has been added to HERE map widget
 2023-03-30 12:31:48 +03:00
Vladyslav_Prykhodko
f3b538d6a9 UI: Fixed navigatePrevState and updated help template 2023-03-30 12:21:20 +03:00
ViacheslavKlimov
5c8d9e9f8d Merge branch 'develop/3.5' into improvements/notification-system 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbEntityDataSubscriptionService.java
 2023-03-30 12:14:53 +03:00
rusikv
a575ebb37c Change alarm details field color to primary color hue 2023-03-30 12:07:14 +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