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

12131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Kulikov
092a71dbb4
Merge pull request #7758 from vvlladd28/bug/bulk-import/validation-name 
[3.4.3] UI: Fixed validation in bulk import and improvement bulk import for Edge
 2022-12-16 15:54:41 +02:00
ShvaykaD
3d27340cb5 fix audit log tests 2022-12-16 15:52:20 +02:00
ShvaykaD
9e33a8d7be fix typo after refactoring in BaseEntityServiceRegistryTest 2022-12-15 16:59:26 +02:00
ShvaykaD
e74a5686a2 added message for assertNotNull check in BaseEntityServiceRegistryTest 2022-12-15 16:32:39 +02:00
ViacheslavKlimov
4b39d2a221 Notification request stats 2022-12-15 15:50:01 +02:00
ViacheslavKlimov
aa89d0e936 Merge branch 'master' into feature/notification-system 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java
#	application/src/main/java/org/thingsboard/server/service/ws/DefaultWebSocketService.java
#	application/src/test/java/org/thingsboard/server/controller/BaseWebsocketApiTest.java
#	application/src/test/java/org/thingsboard/server/controller/TbTestWebSocketClient.java
 2022-12-15 15:32:26 +02:00
ShvaykaD
1d5bf98504 removed unused import in DefaultEntityServiceRegistry 2022-12-15 15:22:53 +02:00
ShvaykaD
da0a0aed30 fix typo after refactoring 2022-12-15 15:18:01 +02:00
ShvaykaD
5c5b83c4ce updated logic & fix typos after review 2022-12-15 15:10:38 +02:00
Volodymyr Babak
268f0499bf Merge branch 'master' of github.com:thingsboard/thingsboard into edge/misc-fixes 2022-12-15 14:53:39 +02:00
Andrew Shvayka
985b985265
Merge pull request #7801 from dashevchenko/addedDeviceProfileServiceToTbContext 
[3.4.3] Added DeviceProfileService and AssetProfileService to TBContext
 2022-12-15 14:39:21 +02:00
Andrew Shvayka
6b53b609a3
Merge pull request #7803 from YevhenBondarenko/fix/bulk-import-test 
[3.4.3]fixed bulk import test infinite await
 2022-12-15 14:37:58 +02:00
Andrii Shvaika
aadc2e35b7 Merge with master 2022-12-15 14:27:13 +02:00
YevhenBondarenko
df28b21733 fixed bulk import test infinite await 2022-12-15 13:19:03 +01:00
Andrii Shvaika
bb79dbf273 Release notes autogeneration 2022-12-15 14:18:20 +02:00
Andrii Shvaika
f97fa79b2a Release notes auto-generation 2022-12-15 14:15:10 +02:00
Andrew Shvayka
3c84ad5072
Merge pull request #7791 from YuriyLytvynchuk/bugfix/split_array_node 
[3.5] Bugfix: Node 'split array msg'. Empty array
 2022-12-15 12:43:46 +02:00
dashevchenko
b567341481 added DeviceProfileService and AssetProfileService to TBContext 2022-12-15 12:36:23 +02:00
Andrew Shvayka
10587d797e
Merge pull request #7788 from ViacheslavKlimov/fix/sysadmin-ws-session 
[3.4.3] Fix NPE on WS subscription for sysadmin
 2022-12-15 12:07:51 +02:00
ViacheslavKlimov
a6bfb049aa Improvements for notification templates 2022-12-14 19:02:23 +02:00
ViacheslavKlimov
377f59400d BaseController refactoring: remove boilerplate permission checks 2022-12-14 18:57:57 +02:00
Andrii Shvaika
68ffd803fe Merge branch 'feature/base-entity-service-improvement' of github.com:ShvaykaD/thingsboard into develop/3.5 2022-12-14 16:42:38 +02:00
ViacheslavKlimov
deb2867df1 Multiple notification delivery methods; notification templates 2022-12-14 14:27:20 +02:00
Vladyslav_Prykhodko
93fb9754ef UI: Always visible action button in multiple input widgets 2022-12-14 13:14:58 +02:00
ShvaykaD
7d9f437927 rollback optional changes for fetchEntityCustomerId method 2022-12-14 12:37:19 +02:00
ShvaykaD
f167c7c48b code cleanup after review 2022-12-14 12:30:27 +02:00
Volodymyr Babak
f399a80dee Merge remote-tracking branch 'upstream/master' into edge/misc-fixes 2022-12-13 17:11:24 +02:00
Andrew Shvayka
7b2494c1e0
Merge pull request #7786 from YevhenBondarenko/fix/device-with-credentials 
[3.4.3] fixed saveDeviceWithCredentials notifications
 2022-12-13 17:02:29 +02:00
Andrew Shvayka
28d151b940
Merge pull request #7783 from YevhenBondarenko/fix/bulk-import 
[3.4.3] fixed device bulk import with empty credentials
 2022-12-13 16:58:17 +02:00
Igor Kulikov
a6f2d114f1 UI navigation improvements 2022-12-13 16:28:30 +02:00
Volodymyr Babak
4c60bd1a4e Edge rule chain service - fixed update of root rule chain in runtime 2022-12-13 16:15:33 +02:00
Yuriy Lytvynchuk
603f71bbe2 fix empty array & nodeDetails 2022-12-13 16:09:36 +02:00
Volodymyr Babak
10ab64b0d5 Device Edge Service - push inactivityTimeout to edge 2022-12-13 15:55:00 +02:00
Volodymyr Babak
055fbce062 Edge telemetry processor - added support of USER entity 2022-12-13 15:41:53 +02:00
Igor Kulikov
5645527a3b Update TBEL version to 1.0.4 2022-12-13 15:20:04 +02:00
ViacheslavKlimov
4a834a0442 Fix NPE on WS subscription for sysadmin 2022-12-13 15:06:29 +02:00
Volodymyr Babak
0cd2ad03ad Added support of USER entity in Push to Edge / Push to Cloud rule nodes 2022-12-13 14:42:36 +02:00
Andrew Shvayka
db0288dda3
Merge pull request #7784 from ViacheslavKlimov/fix/entity-view-ts 
[3.4.3] Fix for ts subscription handling
 2022-12-13 13:04:13 +02:00
ViacheslavKlimov
1ba77a30d7 Merge branch 'master' into feature/notification-system 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java
#	application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
 2022-12-13 12:55:21 +02:00
YevhenBondarenko
7cb9166677 fixed saveDeviceWithCredentials notifications 2022-12-13 10:58:34 +01:00
Vladyslav_Prykhodko
d87634f524 UI: Add new Danish language 2022-12-13 11:11:24 +02:00
ViacheslavKlimov
139e5d28fb Fix handleGetTsCmd: add to lastTsMap 2022-12-13 10:57:29 +02:00
YevhenBondarenko
d2233e5157 added bulk import device test 2022-12-12 18:40:50 +01:00
ShvaykaD
e21cae2a43 fix typo in BaseRelationService 2022-12-12 19:32:40 +02:00
ShvaykaD
0bef324a1f refactoring after review 2022-12-12 19:18:45 +02:00
Artem Dzhereleiko
fa46e883f9 UI: Fixed Catalan locale designator 2022-12-12 18:08:08 +02:00
YevhenBondarenko
3430425086 fixed device bulk import with empty credentials 2022-12-12 16:40:43 +01:00
Andrii Shvaika
67340baddf Performance improvement to update procedure 2022-12-12 16:44:54 +02:00
Andrew Shvayka
5e1fa45a10
Merge pull request #7768 from ViacheslavKlimov/fix/pagelink-validation 
[3.4.3] Additional pageLink validation
 2022-12-12 16:35:46 +02:00
Andrew Shvayka
4ce6cd0901
Merge pull request #7773 from volodymyr-babak/bug/fix-duplicate-ws-updates 
[3.4.3][Bug] Getting a lot of updates over WS in case of aggregation query, even if no real updates happened
 2022-12-12 16:33:41 +02:00