20272 Commits

Author SHA1 Message Date
Andrii Landiak
0ab35b72d2 Edge: impl new approach with oauth 2024-08-26 14:51:36 +03:00
ViacheslavKlimov
99df23bdc9 Merge branch 'master' of github.com:thingsboard/thingsboard into fix/snmp-v3 2024-08-26 13:32:34 +03:00
dashevchenko
c9b46f2e02 minor refactoring 2024-08-26 10:55:41 +03:00
dashevchenko
6f833a3b18 minor refactoring 2024-08-26 10:51:13 +03:00
Igor Kulikov
bc7f4b3333 UI: Menu service: minor fix 2024-08-23 18:01:13 +03:00
Igor Kulikov
8d1ef3bbd3
Merge pull request #11483 from ArtemDzhereleiko/AD/scada/tank/refactoring-ids
Refactoring stateRenderFunction for SCADA tanks
2024-08-23 15:40:11 +03:00
Artem Dzhereleiko
c16e11d664 UI: Refactoring tanks 2024-08-23 15:37:49 +03:00
Igor Kulikov
a42d27dc20
Merge pull request #11479 from ArtemDzhereleiko/AD/scada/uniq-ids
SCADA symbol replace for unique ids
2024-08-23 14:17:21 +03:00
Igor Kulikov
dfbf29d996
Merge pull request #11472 from ArtemDzhereleiko/AD/hot-fix/scada-tank
Refactoring SCADA Elevated tank
2024-08-23 14:13:26 +03:00
Igor Kulikov
9a95d0b010
Merge pull request #11467 from ArtemDzhereleiko/AD/scada/heat-pump
Heat pump SCADA symbols
2024-08-23 14:12:29 +03:00
Artem Dzhereleiko
f003582f14 UI: scada symbol replace for unique ids 2024-08-23 12:53:12 +03:00
IrynaMatveieva
aac427d6be added one more verification in upgrade 2024-08-23 12:34:43 +03:00
IrynaMatveieva
a59552dc1d fixed tests in alarm controller 2024-08-23 12:16:51 +03:00
IrynaMatveieva
23353d5f45 Merge remote-tracking branch 'upstream/master' into improvements/delay-node 2024-08-23 11:28:41 +03:00
Artem Dzhereleiko
8d232c64c9 UI: Refactoring 2024-08-23 10:21:53 +03:00
Max Petrov
1ae7a27929
Merge branch 'master' into improvement/4194-add-trace-log-level 2024-08-22 17:54:13 +03:00
mpetrov
6df8a97a01 Added trace log level 2024-08-22 17:52:01 +03:00
mpetrov
36f767a9ce refactoring 2024-08-22 17:28:45 +03:00
Igor Kulikov
1974237d65
Merge pull request #11471 from maxunbearable/fix/hotfix-dahsboard-widget-editing
Fixed issue with not saving Widget on Widget editing
2024-08-22 17:03:59 +03:00
Artem Dzhereleiko
ddff3b93cc UI: update tank 2024-08-22 16:54:10 +03:00
mpetrov
7bf79cfe3d changed approach to dashboard version change 2024-08-22 16:47:54 +03:00
IrynaMatveieva
5032938f49 removed brackets 2024-08-22 16:38:47 +03:00
mpetrov
da277be306 Fixed issue with not saving Widget on Widget editing 2024-08-22 16:31:26 +03:00
IrynaMatveieva
8c681508d5 changed list to set 2024-08-22 15:05:59 +03:00
Viacheslav Klimov
a003ca4de5
Merge branch 'master' into http_transport_large_request_fix 2024-08-22 14:46:58 +03:00
Viacheslav Klimov
f30cee2f12
Merge pull request #11469 from thingsboard/fix/notification-unknown-recipient
Ignore unknown notification recipient groups
2024-08-22 14:41:32 +03:00
Viacheslav Klimov
0c15791c2e
Merge pull request #11466 from thingsboard/fix/versioned-entity
Fix entity's version incremented twice
2024-08-22 14:37:15 +03:00
Viacheslav Klimov
9e9488e4f0
Merge pull request #11459 from YevhenBondarenko/fix/ota-package
fixed queries for get/count devices without OTA
2024-08-22 14:34:37 +03:00
IrynaMatveieva
5e033ff066 added additional verification in tests 2024-08-22 14:04:33 +03:00
ViacheslavKlimov
69b89ebb79 Ignore unknown notification recipients 2024-08-22 13:45:33 +03:00
Viacheslav Klimov
efabd86ad6
Merge pull request #11468 from thingsboard/fix/vc-ssh-error
VC: fix error message when using https url with private key authentication
2024-08-22 13:09:30 +03:00
ViacheslavKlimov
98ac14dfbe VC: Fix error message when using https url with private key authentication 2024-08-22 13:08:45 +03:00
Artem Dzhereleiko
d5ee96e295 UI: SCADA Heat pump 2024-08-22 12:36:05 +03:00
ViacheslavKlimov
f0186ca996 Fix entity update query executed twice (resulting in double version increment) 2024-08-22 12:31:52 +03:00
IrynaMatveieva
b19708540f added tests 2024-08-22 11:30:40 +03:00
mpetrov
f0123d7c7b license headers 2024-08-21 18:46:49 +03:00
Max Petrov
0bcca5607a
Merge branch 'master' into improvement/4193-gateway-config-advanced 2024-08-21 18:41:22 +03:00
mpetrov
0599ea0647 Added Flow to edit Gateway Config as JSON in Advanced config tab 2024-08-21 18:37:53 +03:00
Vladyslav_Prykhodko
0c4507f02a UI: Add return dialogRef in openDashboardStateInSeparateDialog 2024-08-21 17:55:34 +03:00
Vladyslav_Prykhodko
c64468357d Merge branch 'master' of github.com:Prometheus4800/thingsboard into Prometheus4800-master 2024-08-21 17:48:32 +03:00
IrynaMatveieva
45f298fb0d changed entity name to device name when alarm 2024-08-21 16:48:33 +03:00
rusikv
3eb7efe0ad UI: fixed oauth2 client lists not updating with values 2024-08-21 16:31:07 +03:00
YevhenBondarenko
7f2d78cb04 added corresponding tests 2024-08-21 15:28:18 +02:00
Igor Kulikov
1e1e725f6a Merge branch 'master' of github.com:thingsboard/thingsboard 2024-08-21 16:12:57 +03:00
Igor Kulikov
ef93522df0 UI: Fix MenuId enum 2fa -> two_fa 2024-08-21 15:56:24 +03:00
YevhenBondarenko
3eb760e648 fixed queries for get/count devices without ota 2024-08-21 13:52:22 +02:00
dashevchenko
dba36a8e5a fixed upgrade script 2024-08-21 13:46:48 +03:00
Viacheslav Klimov
20cdef4ac2
Merge pull request #11458 from thingsboard/fix/versioned-cache
Fix getOrFetchFromDB for versioned transactional cache
2024-08-21 12:50:49 +03:00
ViacheslavKlimov
92c09243ef Fix transactionalCache.getOrFetchFromDB 2024-08-21 12:42:20 +03:00
YevhenBondarenko
805deffaa2 refactored due to comments 2024-08-21 11:39:16 +02:00