3231 Commits

Author SHA1 Message Date
Maksym Dudnik
dc63ce47aa fixes 2023-06-01 11:00:42 +03:00
Maksym Dudnik
15690ead07 fixes 2023-05-31 13:57:51 +03:00
Maksym Dudnik
d7909e7b71 fixes 2023-05-29 16:21:35 +03:00
Maksym Dudnik
48b8bd72d6 fixes 2023-05-29 15:52:16 +03:00
Maksym Dudnik
aa97fb4aff fixes 2023-05-26 12:34:39 +03:00
Maksym Dudnik
44982a5744 fixes 2023-05-26 12:20:54 +03:00
Maksym Dudnik
73fac5be70 fixes 2023-05-25 15:37:45 +03:00
Maksym Dudnik
ad94a35348 fixes 2023-05-25 15:27:36 +03:00
Maksym Dudnik
1d8196f9e6 fixes 2023-05-25 15:07:00 +03:00
Maksym Dudnik
8ef51cae96 fixes 2023-05-25 14:43:18 +03:00
Maksym Dudnik
c834f5963e fixes 2023-05-25 14:42:01 +03:00
Maksym Dudnik
5a1e1e4626 fixes 2023-05-25 13:44:42 +03:00
Maksym Dudnik
39ecd5438a fixes 2023-05-25 13:44:22 +03:00
Maksym Dudnik
481c859426 fixes 2023-05-25 13:43:24 +03:00
Maksym Dudnik
a66b76697f fixes 2023-05-25 13:06:44 +03:00
Maksym Dudnik
09062adf39 fixes 2023-05-25 13:03:05 +03:00
Maksym Dudnik
dc1110e9a1 fixes 2023-05-24 16:54:49 +03:00
Maksym Dudnik
3d41b6e35e fixes 2023-05-24 16:12:38 +03:00
Maksym Dudnik
6d1e583a93 fixes 2023-05-24 15:36:57 +03:00
Maksym Dudnik
3765209600 fixes 2023-05-24 14:03:07 +03:00
Maksym Dudnik
8f3898fd07 fixes 2023-05-24 12:38:17 +03:00
Maksym Dudnik
17016e4bbf fixes 2023-05-24 11:49:29 +03:00
Maksym Dudnik
475e7525ca fixes 2023-05-24 11:12:08 +03:00
Maksym Dudnik
42e196906d mark2 gateway dashboard 2023-05-19 10:28:24 +03:00
Maksym Dudnik
5aa9398a61 hotfix v2 2023-04-10 16:27:44 +03:00
Maksym Dudnik
5059344949 hotfix fix 2023-04-10 15:46:21 +03:00
Maksym Dudnik
7951e75ddf licence fix 2023-04-08 01:50:36 +03:00
Maksym Dudnik
9497f28535 CE pre PR comit from PE 2023-04-08 00:57:57 +03:00
Maksym Dudnik
1b4734d4d8 Merge branch 'develop/3.5' of https://github.com/thingsboard/thingsboard into gateway_list
 Conflicts:
	ui-ngx/src/app/modules/home/components/home-components.module.ts
	ui-ngx/src/app/modules/home/components/shared-home-components.module.ts
2023-04-07 16:31:26 +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
Andrew Shvayka
14ed9df205
Merge pull request #6986 from adovh/feature/work-1385-custom-mqtt-subscribe-topic
[3.5] added ability to create&subscribe custom mqtt attributes topics
2023-04-07 13:48:20 +03:00
Andrew Shvayka
a8d0d871e1
Merge pull request #8285 from rusikv/alarm-details-redesign
Alarm details redesign
2023-04-07 13:05:03 +03:00
Andrew Shvayka
43489f8e13
Merge pull request #8294 from ChantsovaEkaterina/improvement/widget-custom-action-help-update-alarm-info-links
Update links for alarm info in widget custom action help
2023-04-07 13:04:24 +03:00
rusikv
1eb7f12310 Amendments after review 2023-04-07 12:15:31 +03:00
Vladyslav_Prykhodko
d8bf2b75f7 UI: Change notification template/rule type disabled in edit mode 2023-04-07 11:18:12 +03:00
rusikv
bcee982497 Merge remote-tracking branch 'upstream/develop/3.5' into alarm-details-redesign 2023-04-06 16:08: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
Vladyslav_Prykhodko
89362dedf1 UI: Add filter entity type for notification rule 2023-04-05 17:42:14 +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
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
Vladyslav_Prykhodko
c4bb1d8476 Merge remote-tracking branch 'upstream/develop/3.5' into improvements/notification-system 2023-04-04 12:52: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
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