Andrew Shvayka
|
b3f2314c11
|
Merge pull request #9327 from chenggwang/master
#9328 Making it possible to use CompletableFuture
|
2024-09-09 17:57:51 +03:00 |
|
ThingsBoard Bot
|
189778efb9
|
License header format
|
2024-09-09 14:57:22 +00:00 |
|
Andrew Shvayka
|
0192aed991
|
Merge branch 'master' into master
|
2024-09-09 17:56:44 +03:00 |
|
Chantsova Ekaterina
|
fdb9913625
|
UI: Timewindow - interval options style change
|
2024-09-09 17:54:29 +03:00 |
|
Andrew Shvayka
|
e286a051df
|
Merge pull request #8696 from driesva/rabbitmq-max-poll-messages
fix: Slow RabbitMQ message polling
|
2024-09-09 17:45:30 +03:00 |
|
Max Petrov
|
c56efe352d
|
Merge branch 'master' into task/4114-gateway-version-compatibility
|
2024-09-09 17:43:15 +03:00 |
|
mpetrov
|
618d82b7ac
|
Changed approach to GatewayConnector generic
|
2024-09-09 17:42:46 +03:00 |
|
Andrew Shvayka
|
6b1336816c
|
Merge pull request #10911 from arminfelder/fix/jsExecutorDefaultKafkaCompression
[FIX] inconsistent default kafka setting (compression)
|
2024-09-09 17:33:20 +03:00 |
|
Vladyslav_Prykhodko
|
00d6f7d5be
|
UI: Refactor SCADA editor highlighting to support Safari on iOS versions 16.3 and below
|
2024-09-09 17:28:41 +03:00 |
|
Andrew Shvayka
|
14827bb175
|
Merge pull request #11453 from AldirchEugene/master
Fixed the problem of getAlarmTypes method query failure in rest-client
|
2024-09-09 17:27:36 +03:00 |
|
Andrew Shvayka
|
efba1446ad
|
Merge pull request #11413 from eltociear/patch-1
chore: update proto_config.proto
|
2024-09-09 17:26:56 +03:00 |
|
rusikv
|
eb244e3de9
|
UI: add origUserFilters optional param for AliasController constructor
|
2024-09-09 17:23:47 +03:00 |
|
Igor Kulikov
|
a3329b6323
|
Merge pull request #11560 from engix-ltd/add-event-and-audit-log-services
Added Event and Audit Logs services to services map.
|
2024-09-09 17:18:51 +03:00 |
|
Max Petrov
|
5b8ea8fc0d
|
Merge branch 'master' into task/4114-gateway-version-compatibility
|
2024-09-09 16:17:17 +03:00 |
|
mpetrov
|
f97598ee08
|
refactoring
|
2024-09-09 16:17:00 +03:00 |
|
Andrew Shvayka
|
0a5a60cded
|
Merge pull request #10901 from imbeacon/fix/profiles-creation-with-default-name-but-default-profile-exists
Fixed creation of profiles with name "default" and existing default renamed profile
|
2024-09-09 15:54:50 +03:00 |
|
imbeacon
|
80957f3259
|
Changes due to comments
|
2024-09-09 15:52:55 +03:00 |
|
imbeacon
|
c95d89d550
|
Merge remote-tracking branch 'origin/improvement/provisioning-gateway-device' into improvement/provisioning-gateway-device
|
2024-09-09 15:38:04 +03:00 |
|
imbeacon
|
945caa354e
|
Merge remote-tracking branch 'upstream' into improvement/provisioning-gateway-device
|
2024-09-09 15:36:01 +03:00 |
|
mpetrov
|
c4441eba72
|
changed approach to abstract class for mapping
|
2024-09-09 15:30:57 +03:00 |
|
Andrew Shvayka
|
dbf5439bf2
|
Merge pull request #11450 from YevhenBondarenko/feature/mqtt-service-config-rpc
added support of getServiceConfiguration RPC
|
2024-09-09 15:04:26 +03:00 |
|
Andrew Shvayka
|
b2e002293c
|
Merge pull request #11579 from dashevchenko/oauth2ClientsSortFIx
Added sorting by title for oauth2 clients
|
2024-09-09 15:02:46 +03:00 |
|
Andrew Shvayka
|
742cb03dcc
|
Merge pull request #11580 from YevhenBondarenko/fix/tb-http-client
Fixed credentials check if simple client factory is used and fixed checks for system proxy properties in TbHttpClient
|
2024-09-09 15:01:53 +03:00 |
|
Artem Dzhereleiko
|
28953b4c5b
|
UI: update scada bundle and add images
|
2024-09-09 14:40:23 +03:00 |
|
Volodymyr Babak
|
6098f19dc2
|
Refactoring to remove duplicates
|
2024-09-09 13:51:49 +03:00 |
|
Volodymyr Babak
|
ab2fb38e05
|
RuleChainEdgeTest - added testUpdateRootRuleChain
|
2024-09-09 13:41:40 +03:00 |
|
Igor Kulikov
|
a88840cdb5
|
UI: Fix widget edit actions tooltip position.
|
2024-09-09 12:42:39 +03:00 |
|
Artem Dzhereleiko
|
084c7566ee
|
UI: Fixed click action for water level symbol
|
2024-09-09 11:57:36 +03:00 |
|
IrynaMatveieva
|
8c57dddc4d
|
fixed conflict files
|
2024-09-09 11:40:19 +03:00 |
|
Max Petrov
|
d66130fc2c
|
Merge branch 'master' into task/4114-gateway-version-compatibility
|
2024-09-09 11:31:30 +03:00 |
|
Volodymyr Babak
|
83aff21277
|
EdgeEventSourcingListener - return in case errors during processing ASSIGNED_TO_EDGE rule chain event
|
2024-09-09 10:55:03 +03:00 |
|
Artem Dzhereleiko
|
217247eddc
|
UI: update rulenode config
|
2024-09-09 10:37:37 +03:00 |
|
nick
|
c548465a2c
|
lwm2m: fix bug Observe Composite - license
|
2024-09-09 09:04:39 +03:00 |
|
nick
|
2bd18ee5dd
|
lwm2m: fix bug Observe Composite
|
2024-09-08 21:15:20 +03:00 |
|
Max Petrov
|
9ec4cfc681
|
Merge branch 'master' into fix/4336-gateway-default-credentials
|
2024-09-06 19:39:20 +03:00 |
|
mpetrov
|
f9a64731b3
|
Fixed default credentials for created Gateway and refactored gateway basic config
|
2024-09-06 19:37:27 +03:00 |
|
Chantsova Ekaterina
|
2bfb99edbb
|
UI: change timewindow aggregation options style
|
2024-09-06 19:02:25 +03:00 |
|
Igor Kulikov
|
174166d9a1
|
SCADA Symbol editor: Add XML editor mode.
|
2024-09-06 18:18:10 +03:00 |
|
Vladyslav_Prykhodko
|
e6bffae9c0
|
UI: Improved show error in layout settings
|
2024-09-06 17:42:46 +03:00 |
|
Max Petrov
|
f535604ce9
|
Merge branch 'master' into task/4114-gateway-version-compatibility
|
2024-09-06 17:19:12 +03:00 |
|
Volodymyr Babak
|
70a60abc02
|
Fixed issue with Edge Root Rule Chain cache for related edges
|
2024-09-06 16:45:18 +03:00 |
|
Chantsova Ekaterina
|
c5104711bb
|
UI: fix saving dashboard timewindow configuration
|
2024-09-06 16:40:43 +03:00 |
|
Artem Dzhereleiko
|
e3b63f9f36
|
UI: Refactoring
|
2024-09-06 15:43:10 +03:00 |
|
Artem Dzhereleiko
|
7c442b000a
|
UI: Minor inmprovement for SCADA system
|
2024-09-06 15:26:13 +03:00 |
|
dashevchenko
|
c84b2fc3de
|
fixed tests
|
2024-09-06 15:21:36 +03:00 |
|
Chantsova Ekaterina
|
ac27bc6592
|
Optimize stiles
|
2024-09-06 14:57:41 +03:00 |
|
Igor Kulikov
|
9e8ca44d44
|
Merge pull request #11532 from ArtemDzhereleiko/AD/scada/water-level
Water meter SCADA symbols
|
2024-09-06 12:29:33 +03:00 |
|
Artem Dzhereleiko
|
1f7ff3cca8
|
UI: merge with master and resolve conflict
|
2024-09-06 12:14:18 +03:00 |
|
Artem Dzhereleiko
|
27fa09037f
|
UI: Fixed right analog water meter symbol
|
2024-09-06 12:12:05 +03:00 |
|
Igor Kulikov
|
750035fc37
|
Merge pull request #11550 from ArtemDzhereleiko/AD/scada/leak-sensor
SCADA symbol Leak sensor and water stop
|
2024-09-06 12:04:00 +03:00 |
|