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

4709 Commits

Author SHA1 Message Date
zbeacon
a812a88db1 Refactoring to keep EntityService 2022-12-30 12:51:45 +02:00
zbeacon
022aee36d0 Merge with develop/3.5 2022-12-29 20:49:58 +02:00
zbeacon
d9add9bdf8 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2022-12-29 20:49:29 +02:00
Andrii Shvaika
0a0099207e Merge branch 'master' into develop/3.5 2022-12-28 12:30:52 +02:00
Andrii Shvaika
34d7a6ced8 Merge remote-tracking branch 'origin/master' into develop/3.5 2022-12-27 13:06:46 +02:00
Andrii Landiak
89bb6cafce Improve swagger description for SaveAttributes 2022-12-27 11:15:00 +02:00
Andrew Shvayka
5cc449a686
Merge pull request #7838 from YevhenBondarenko/fix/device-sessions-dump 
[3.5] fixed device sessions dump
 2022-12-26 15:40:44 +02:00
Volodymyr Babak
f04753d3f9 Fixed incorrect index creation for edge event migration 2022-12-23 16:35:15 +02:00
YevhenBondarenko
36793c432d fixed device sessions dump 2022-12-23 15:07:44 +01:00
Andrii Shvaika
83b2005601 Merge branch 'feature/base-entity-service-improvement' of github.com:ShvaykaD/thingsboard into develop/3.5 2022-12-22 11:41:50 +02:00
zbeacon
5710f01c03 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2022-12-22 08:30:42 +02:00
Igor Kulikov
acfb357135 Update UI help link 2022-12-20 16:59:45 +02:00
Andrew Shvayka
84c82d08a7
Merge pull request #7792 from volodymyr-babak/edge/misc-fixes 
[3.4.3][Bug] Edge root rule chain update fix. USER entity support added. INACTIVITY_TIMEOUT pushed to edge.
 2022-12-19 11:56:47 +02:00
ViacheslavKlimov
55fc7131fb Validation for rule node configuration; improve validation error message 2022-12-17 16:58:58 +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
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
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
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
Volodymyr Babak
4c60bd1a4e Edge rule chain service - fixed update of root rule chain in runtime 2022-12-13 16:15:33 +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
ViacheslavKlimov
4a834a0442 Fix NPE on WS subscription for sysadmin 2022-12-13 15:06:29 +02:00
zbeacon
f29d1b0eff Added HasLabel, HasEmail, HasTitle interfaces to get correctly label in entityService, refactoring for alarms processing. The main point is swithing from Alarm entity to AlarmInfo 2022-12-13 13:39:09 +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
YevhenBondarenko
7cb9166677 fixed saveDeviceWithCredentials notifications 2022-12-13 10:58:34 +01: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
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
Volodymyr Babak
8df0078989 TbEntityDataSubCtx. getCurrentAggregation() - if curTsCmd or curTsCmd.getAgg is null - return NONE 2022-12-12 16:02:38 +02:00
Volodymyr Babak
3659c6d5b3 TbEntityDataSubCtx. getCurrentAggregation() - Added safe for null and return NONE in case null 2022-12-12 15:55:58 +02:00
Andrew Shvayka
0ee678e234
Merge pull request #7761 from ViacheslavKlimov/fix/entity-view-ts 
[3.4.3] Fix no timeseries data in widget for entity view; fix State Chart invalid behavior
 2022-12-12 15:54:29 +02:00
ViacheslavKlimov
606bab64bc Fix for handleGetTsCmd when fetchLatestPreviousPoint is enabled 2022-12-12 13:57:19 +02:00
zbeacon
08e356a415 Updated alarm assignment to send websocket update on assign, added originator label to alarm info 2022-12-12 13:00:22 +02:00
ViacheslavKlimov
808b1dc0c5 'Show merge commits' option in repository settings 2022-12-09 18:31:59 +02:00
ViacheslavKlimov
2494cec616 Add validation for EntityDataPageLink 2022-12-09 16:25:09 +02:00
Volodymyr Babak
7042d05149 Set correct latest ts for key states in case of timeseries aggregation query 2022-12-09 15:58:35 +02:00
ViacheslavKlimov
bb42362f1d Add pageLink sort property validation 2022-12-09 12:21:40 +02:00
Andrew Shvayka
f813073bfb
Merge pull request #7596 from imbeacon/mqtt5-codes 
[3.5] Added Mqtt v5 reason codes for ack messages
 2022-12-08 14:40:14 +02:00
ViacheslavKlimov
a272b46780 Add log when queryId in ReadTsKvQueryResult not matching 2022-12-08 14:21:47 +02:00