rusikv
|
753bacd2dc
|
UI: oauth settings style improvement
|
2024-03-25 16:31:56 +02:00 |
|
Andrii Landiak
|
2e91612534
|
Minor refactoring
|
2024-03-25 14:04:08 +02:00 |
|
Andrii Landiak
|
8fb54e6759
|
Merge remote-tracking branch 'upstream/master' into fix/kv-proto-util
|
2024-03-25 13:33:38 +02:00 |
|
Igor Kulikov
|
6890b18dfb
|
Swagger doc improvement.
|
2024-03-25 13:10:58 +02:00 |
|
Viacheslav Klimov
|
164363b39a
|
Merge pull request #10429 from thingsboard/master-with-hotfix
hotfix/3.6.3 to master
|
2024-03-25 13:01:57 +02:00 |
|
ViacheslavKlimov
|
2e20ad6dc6
|
Add tenantId tag to Rule Engine consumer stats
|
2024-03-25 12:51:58 +02:00 |
|
Andrii Landiak
|
7edb18673c
|
Improve test for KvProtoUtil
|
2024-03-25 12:47:20 +02:00 |
|
Igor Kulikov
|
8a890a4512
|
Fix compilation error
|
2024-03-25 12:45:28 +02:00 |
|
Igor Kulikov
|
bec63ab1bf
|
Swagger doc improvement.
|
2024-03-25 12:28:04 +02:00 |
|
Igor Kulikov
|
ffd67873ef
|
Merge branch 'master' into feature/swagger3.1
|
2024-03-25 12:11:55 +02:00 |
|
Artem Dzhereleiko
|
119d1262a3
|
UI: Update pl locale
|
2024-03-25 11:57:46 +02:00 |
|
ViacheslavKlimov
|
8a58fd49b5
|
Fix import in DefaultEntityServiceRegistry
|
2024-03-25 11:28:59 +02:00 |
|
ViacheslavKlimov
|
03cb21b79a
|
Merge branch 'hotfix/3.6.3' into master-with-hotfix
# Conflicts:
# common/util/src/main/java/org/thingsboard/common/util/SslUtil.java
|
2024-03-25 09:56:57 +02:00 |
|
Igor Kulikov
|
8910b4b1df
|
Swagger docs Open API 3.1
|
2024-03-22 20:02:51 +02:00 |
|
Igor Kulikov
|
01335e87ee
|
Merge pull request #10423 from ArtemDzhereleiko/AD/hot-fix/power-button-svg-firefox
Fixed Power button widget on Firefox
|
2024-03-22 19:17:25 +02:00 |
|
Igor Kulikov
|
fcc8ce0430
|
Merge pull request #10422 from ArtemDzhereleiko/AD/hot-fix/mask-prefix
Fixed mask for older version chrome
|
2024-03-22 19:16:53 +02:00 |
|
Igor Kulikov
|
95a17c4120
|
Merge pull request #10424 from ChantsovaEkaterina/bugs/timewindow-intervals/not-apply
Fixed some time new time windows intervals not apply in timewindows panel
|
2024-03-22 19:16:20 +02:00 |
|
Vladyslav_Prykhodko
|
8423eac597
|
UI: Improved save value in propagateChange
|
2024-03-22 18:31:28 +02:00 |
|
Artem Dzhereleiko
|
7a43ae9966
|
UI: Fixed power button widget for firefox
|
2024-03-22 18:29:11 +02:00 |
|
Vladyslav_Prykhodko
|
03c3079100
|
UI: Fixed some time new time windows intervals not apply
|
2024-03-22 18:26:32 +02:00 |
|
Artem Dzhereleiko
|
8bd2c1c0c4
|
UI: Fixed mask for older version chrome
|
2024-03-22 17:53:40 +02:00 |
|
Viacheslav Klimov
|
eceed0c4b1
|
Merge pull request #10419 from AndriiLandiak/hotfix/kv-proto-util
Fix TbSubscriptionUtils order for matching KeyValueType and DataType
|
2024-03-22 14:56:19 +02:00 |
|
IrynaMatveieva
|
e29a470856
|
used assertj instead of junit
|
2024-03-22 14:33:03 +02:00 |
|
ViacheslavKlimov
|
ed44db6d25
|
Add delivery_method column to notification; persist mobile notifications
|
2024-03-22 14:20:51 +02:00 |
|
Andrii Landiak
|
d9669c9391
|
Fix TbSubscriptionUtils order for matching KeyValueType and DataType
|
2024-03-22 14:05:25 +02:00 |
|
rusikv
|
f9342a4778
|
UI: fixed widgets in search mode not editable
|
2024-03-22 13:20:20 +02:00 |
|
dashevchenko
|
11b8d3c41e
|
added global queue prefix for pubsub queue factory
|
2024-03-22 13:06:58 +02:00 |
|
Iryna Matveieva
|
f4ca0c8c90
|
Merge branch 'master' into improve-script-node
|
2024-03-22 12:37:25 +02:00 |
|
IrynaMatveieva
|
242b712a90
|
fixed conflicts
|
2024-03-22 12:35:59 +02:00 |
|
Iryna Matveieva
|
4f860f7896
|
Merge branch 'master' into fix-calculate-delta-rule-node
|
2024-03-22 12:31:40 +02:00 |
|
Andrii Landiak
|
ee1209b19f
|
Fix KvProtoUtils order for matching KeyValueType and DataType
|
2024-03-22 12:01:36 +02:00 |
|
IrynaMatveieva
|
e879f63376
|
fixed error message for problem with external id
|
2024-03-22 10:50:21 +02:00 |
|
rusikv
|
9973cc609a
|
UI: upgrade oauth checkboxes to chip buttons
|
2024-03-21 18:39:05 +02:00 |
|
ViacheslavKlimov
|
a529abeced
|
Fix attributes removal by entity id
|
2024-03-21 12:43:34 +02:00 |
|
Viacheslav Klimov
|
cd82ac0ea0
|
Merge pull request #10408 from AndriiLandiak/fix/tenant-profile-limits
Edge - minor fix
|
2024-03-21 12:24:00 +02:00 |
|
Andrii Landiak
|
b46728de70
|
Fix V1 for tenantPrfoile to correctly set profile data
|
2024-03-21 12:22:48 +02:00 |
|
Andrii Landiak
|
420cebcd03
|
Use getDefaultProfileConfiguration instead of casting
|
2024-03-21 11:55:02 +02:00 |
|
ViacheslavKlimov
|
be3e78044c
|
Merge remote-tracking branch 'origin/master' into feature/housekeeper
|
2024-03-21 11:52:07 +02:00 |
|
Andrii Landiak
|
37d5405dc5
|
Merge remote-tracking branch 'upstream/master' into feature/edge-oauth-support
|
2024-03-21 11:17:16 +02:00 |
|
Andrii Landiak
|
28ef94bb1c
|
Remove api limits from tenantProfileEdgeMsg
|
2024-03-21 11:07:33 +02:00 |
|
dashevchenko
|
ab638cfa19
|
add defaultSorting by default
|
2024-03-20 18:53:26 +02:00 |
|
dashevchenko
|
1c724df353
|
added await to make tests more stable
|
2024-03-20 17:59:55 +02:00 |
|
Viacheslav Klimov
|
acabcb8462
|
Merge pull request #10406 from thingsboard/develop/3.6.4
develop/3.6.4 to master
|
2024-03-20 15:41:47 +02:00 |
|
dashevchenko
|
56c65f249d
|
added selection mapping for entity property filters
|
2024-03-20 15:12:57 +02:00 |
|
ViacheslavKlimov
|
ae23532ab6
|
Merge remote-tracking branch 'origin/master' into develop/3.6.4
|
2024-03-20 14:00:57 +02:00 |
|
ViacheslavKlimov
|
47cfebe2a7
|
Use QueueConsumerManager for other consumers
|
2024-03-20 13:25:30 +02:00 |
|
rusikv
|
e5da98003f
|
UI: disabled hiding of title panel for alarm table widget in text search mode
|
2024-03-20 12:59:06 +02:00 |
|
ViacheslavKlimov
|
2174a0f3d7
|
Minor refactoring for consumer managers
|
2024-03-20 12:49:40 +02:00 |
|
ViacheslavKlimov
|
e4cbbb0c5d
|
Merge branch 'master' into feature/parallel-core-consumer
# Conflicts:
# application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java
# application/src/main/java/org/thingsboard/server/service/queue/DefaultTbRuleEngineConsumerService.java
# application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractConsumerService.java
|
2024-03-20 12:26:41 +02:00 |
|
Viacheslav Klimov
|
fb9982cd40
|
Merge pull request #10366 from dashevchenko/refreshTokenServiceFix
Oauth2 mail refresh token check is being executed only for active not expired token
|
2024-03-20 12:04:08 +02:00 |
|