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

13158 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Artem Dzhereleiko
3bf4bbb124 Merge remote-tracking branch 'upstream/develop/3.5' into AD/refactoring/timewindow 2023-03-10 12:38:09 +02:00
Seraphym-Tuhai
ec4d567ecd temporary fix after updating google chrome 2023-03-10 09:40:50 +02:00
Seraphym-Tuhai
ed1611af7e Merge branch 'develop/3.5' of https://github.com/thingsboard/thingsboard into fix-ui-tests 2023-03-09 18:39:32 +02:00
Seraphym-Tuhai
e99024d7eb fix locators, fix flaky tests with ElementClickInterceptedException 2023-03-09 18:37:13 +02:00
Vladyslav_Prykhodko
2863bbadc5 UI: Change notification style 2023-03-09 17:10:09 +02:00
Andrii Shvaika
d7ee0fca91 Fix attribute subscription tests 2023-03-09 16:45:15 +02:00
Igor Kulikov
b266632f0b Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into develop/3.5 2023-03-09 15:36:20 +02:00
Igor Kulikov
1f036995e3 UI: Flot widget - set normal letter spacing 2023-03-09 15:36:13 +02:00
Vladyslav_Prykhodko
c173cba872 Merge remote-tracking branch 'klimov/feature/notification-system' into feature/notification-system 2023-03-09 14:45:39 +02:00
Seraphym-Tuhai
3f28eca3b8 Merge branch 'fix-ui-tests' of https://github.com/Seraphym-Tuhai/thingsboard into fix-ui-tests 2023-03-09 13:02:04 +02:00
ViacheslavKlimov
8fcbe876e8 Merge branch 'develop/3.5' into feature/notification-system 
# Conflicts:
#	pom.xml
 2023-03-08 18:16:16 +02:00
Andrii Shvaika
316ae13428 Fix the configuration of consistency level 2023-03-08 18:13:16 +02:00
Andrii Shvaika
3477ddac0f Refactoring due to comments 2023-03-08 17:39:39 +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
Igor Kulikov
62affb04f9 UI: Fix map widget fit to bounds in draggable mode 2023-03-08 16:25:50 +02:00
Vladyslav_Prykhodko
aab053b71c UI: Change notification target 2023-03-08 16:17:13 +02:00
Igor Kulikov
11f54d96fd UI: Improve default time window calculation 2023-03-08 16:02:04 +02:00
Igor Kulikov
3688c6aa44 UI: Improve default time window calculation 2023-03-08 15:45:39 +02:00
Andrii Shvaika
0f5fd481fc Fix server-side RPC requests handling 2023-03-08 15:37:30 +02:00
Andrii Shvaika
85f317b99b Set default value to 0 for assign_ts for backward-compatibility 2023-03-08 15:19:18 +02:00
Vladyslav_Prykhodko
c5fc212c79 Merge remote-tracking branch 'klimov/feature/notification-system' into feature/notification-system 2023-03-08 15:16:48 +02:00
Vladyslav_Prykhodko
da8962ac54 UI: Change style notification system and improv notification ws 2023-03-08 15:16:07 +02:00
Igor Kulikov
b81612e249 Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into develop/3.5 2023-03-08 15:00:01 +02:00
Igor Kulikov
e4671e10a6 UI: markdown component and markdown widget improvements 2023-03-08 14:59:49 +02:00
Seraphym-Tuhai
f590bf64fc fix tests after update on UI 2023-03-08 14:10:51 +02:00
Andrii Shvaika
c905f20224 Merge remote-tracking branch 'origin/develop/3.5' into feature/mqtt/sparkplug 2023-03-08 13:27:17 +02:00
ViacheslavKlimov
a56261ac9d Merge with develop/3.5 2023-03-08 13:11:31 +02:00
Andrew Shvayka
d508e9db86
Merge pull request #8168 from Seraphym-Tuhai/allure-report-screenshots 
[3.5] Add screenshots in allure reports
 2023-03-08 12:54:29 +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
Andrew Shvayka
b0f1b82eeb
Merge pull request #8181 from rusikv/feature/alarm-assign 
Alarm query backward compatibility fix
 2023-03-08 11:05:50 +02:00
rusikv
411da14083 Moved changed to optional assignee id in alarm query constructor to end 2023-03-07 18:30:58 +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
Artem Dzhereleiko
2e807f319d UI: Fixed form style 2023-03-07 16:03:14 +02:00
Vladyslav_Prykhodko
571574f0f8 UI: Fixed notification system after update Angular15 2023-03-07 12:14:49 +02:00
Igor Kulikov
dc6bc2d1b0 Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into develop/3.5 2023-03-07 10:12:46 +02:00
Igor Kulikov
5df4f0baf0 UI: Fix deepClone function 2023-03-07 10:12:34 +02:00
Andrew Shvayka
57924c647a
Merge pull request #8175 from dashevchenko/fixForUpgradeScript 
Fix for upgrade script
 2023-03-06 19:06:51 +02:00
Igor Kulikov
cb500840f7 UI: Improve dashboard page CSS 2023-03-06 18:47:07 +02:00
dashevchenko
58faac366b fixed upgrade script 2023-03-06 18:40:50 +02:00
Oleksandra Matviienko
906b4083dd testSaveTenantWithIsolatedProfileInMonolithSetup deleted because isolated tenant in monolith is allowed since queue config feature in tenant profile 2023-03-06 17:30:37 +01:00
Igor Kulikov
c9ae2767ff UI: Fix markdown widget css 2023-03-06 18:21:46 +02:00
Andrii Shvaika
aadf7f8295 Merge with develop/3.5 2023-03-06 17:59:37 +02:00
Igor Kulikov
8187a367de UI: Fix entities table widget cell background style 2023-03-06 17:58:37 +02:00
Igor Kulikov
9c388c5135 Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into develop/3.5 2023-03-06 17:37:56 +02:00
Igor Kulikov
1c997aba32 UI: Fix alarm load for alarm details dialog 2023-03-06 17:37:42 +02:00
Oleksandra Matviienko
3ebd9e8992 testSaveTenantWithIsolatedProfileInMonolithSetup ignored because Tenant validator have no such validation since queue config feature 2023-03-06 16:33:36 +01:00
Oleksandra Matviienko
1ae8522bef junit5: BasicMqttCredentialsTest annotation exceptions refactoring 2023-03-06 15:38:50 +01:00
Andrii Shvaika
fefc6df533 Merge with master 2023-03-06 16:33:48 +02:00
Oleksandra Matviienko
6ca287cc68 junit5: BaseTbResourceServiceTest annotation exceptions refactoring 2023-03-06 15:23:36 +01:00