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

1038 Commits

Author SHA1 Message Date
Igor Kulikov
468c007882 Version set to 3.7.1-SNAPSHOT 2024-06-20 15:53:41 +03:00
ViacheslavKlimov
186ab6d50c Merge remote-tracking branch 'origin/master' into feature/notifications-widget 2024-06-20 11:12:20 +03:00
YevhenBondarenko
e2be5c6492 return version instead of key for attributes 2024-06-12 12:23:19 +02:00
YevhenBondarenko
b666f9499a added sequence number for attributes 2024-06-11 15:41:55 +02:00
Igor Kulikov
19630f6c36 Merge branch 'master' into feature/scada-symbol 2024-06-07 15:42:38 +03:00
Igor Kulikov
2500bb2e1c Install SCADA symbols from data folder. UI: SCADA editor -> Add Zoom In/Out buttons, improve tooltips. 2024-06-06 17:26:41 +03:00
dashevchenko
78e4fd3013 added api to retrieve queuestats by ids 2024-06-05 09:41:59 +03:00
dashevchenko
cbe8f1b67f added api to retrieve queue stats entities 2024-06-03 16:27:42 +03:00
Igor Kulikov
7d0e5b330b Introduce ResourceSubType for image resources. 2024-05-08 20:00:32 +03:00
Andrew Shvayka
c8bc0f6793
Merge pull request #10527 from thingsboard/feature/rule-node-caches-replacement 
Replacement of local cache in rule nodes with cached entity service APIs
 2024-05-02 16:02:06 +03:00
Oleksandra Matviienko
63df92e995 JUnit5 migration in common. Junit-platform.properties and logback-test.xml where added to java resource directories if needed. 
Signed-off-by: Oleksandra Matviienko <al.zzzeebra@gmail.com>
 2024-04-26 23:55:17 +02:00
ShvaykaD
9151ba7324 merge with master 2024-04-26 18:11:24 +03:00
Andrew Shvayka
aecf654d65
Merge pull request #10201 from thingsboard/feature/housekeeper 
Housekeeping service
 2024-04-26 13:37:06 +03:00
ViacheslavKlimov
1dcc52dad1 Merge remote-tracking branch 'origin/master' into feature/housekeeper 2024-04-24 11:41:04 +03:00
ShvaykaD
ba195d1a1d move upgrade to java & refactoring after review 2024-04-22 20:24:20 +03:00
Sergey Matvienko
a3e7e0b4a1 major dependency update 2024-04-18 17:11:29 +02:00
ViacheslavKlimov
3803081b57 Refactor alarms deletion; separate tenant entities deletion task 2024-04-18 13:25:40 +03:00
Sergey Matvienko
ec68fe6c96 Merge remote-tracking branch 'ce/master' into feature/latest-ts-redis-cache-aside-dao 
# Conflicts:
#	dao/src/main/java/org/thingsboard/server/dao/sqlts/SqlTimeseriesLatestDao.java
 2024-04-17 12:21:14 +02:00
ShvaykaD
0fb35a3844 merge with master 2024-04-16 12:40:04 +03:00
ShvaykaD
27d026821a fixed adter review 2024-04-16 11:56:56 +03:00
ViacheslavKlimov
79dc46a65b Merge branch 'master' into feature/housekeeper 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
 2024-04-12 15:33:56 +03:00
ViacheslavKlimov
0b18de1482 Refactor entities deletion 2024-04-12 15:32:07 +03:00
Igor Kulikov
ce44bbc248 Merge with hotfix/3.6.3 2024-04-11 17:52:26 +03:00
ViacheslavKlimov
9064bfaa76 Delete tenant entities in batches with id offset 2024-04-11 17:18:47 +03:00
ViacheslavKlimov
feb629f2c2 Alarms deletion in batches with id offset 2024-04-11 14:07:35 +03:00
Viacheslav Klimov
80ec3609de
Merge pull request #10355 from irynamatveieva/improve-script-node 
Changed the logic to be able to find the last IN event despite its order in the debug records.
 2024-04-10 13:19:55 +03:00
ViacheslavKlimov
00f8fd2c35 Merge remote-tracking branch 'origin/master' into feature/housekeeper 2024-04-09 12:08:53 +03:00
Andrew Shvayka
7eb825dc3b
Merge pull request #10472 from thingsboard/fix/event-sourcing 
Fix tenant creation
 2024-04-09 11:01:35 +03:00
Andrew Shvayka
e7f68e3b08
Merge pull request #10420 from thingsboard/fix/mobile-notifications 
Improvements for mobile notifications
 2024-04-09 10:59:37 +03:00
Andrii Shvaika
a88b1ef349 Merge hotfix/3.6.3 to master 2024-04-04 12:56:17 +03:00
Sergey Matvienko
9466578c91 WIP CachedRedisSqlTimeseriesLatestDao.java 2024-04-03 11:46:03 +02:00
ViacheslavKlimov
9d1f751f3a Fix race condition on tenant creation; refactoring 2024-03-29 15:20:56 +02:00
ShvaykaD
85d229be2d convert ValueWithTs to a record & replace usages of Collections.singletonList to List.of & use single key search for async method 2024-03-29 12:05:44 +02:00
dashevchenko
6c911637ae merged with master 2024-03-27 19:04:34 +02:00
dashevchenko
1f1a9c5a25 updated asset/device delete methods to delete only alarms originated by entity 2024-03-27 13:06:03 +02:00
dashevchenko
dae4f313e2 merged with master 2024-03-26 19:09:21 +02:00
ViacheslavKlimov
ed44db6d25 Add delivery_method column to notification; persist mobile notifications 2024-03-22 14:20:51 +02:00
Iryna Matveieva
f4ca0c8c90
Merge branch 'master' into improve-script-node 2024-03-22 12:37:25 +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
ViacheslavKlimov
4ed952a9d6 Merge branch 'master' into develop/3.7 2024-03-19 15:44:23 +02:00
ViacheslavKlimov
1ed95b24a6 Clean up api usage state data on deletion 2024-03-18 18:02:06 +02:00
ViacheslavKlimov
a6719efee5 Housekeeper: alarms deletion 2024-03-18 12:24:58 +02:00
IrynaMatveieva
d67fd993bb added a method to get only the last IN debug event 2024-03-12 17:58:11 +02:00
Andrii Landiak
9f6c9e7330 Merge remote-tracking branch 'upstream/develop/3.6.4' into feature/edge-oauth-support 2024-03-12 11:12:29 +02:00
dashevchenko
c1093dd627 merged with master 2024-03-04 11:54:56 +02:00
ViacheslavKlimov
b20b6006e9 Notifications to sysadmin on housekeeper task processing failure 2024-03-01 14:14:25 +02:00
ViacheslavKlimov
69ead8cc47 Merge branch 'master' into feature/housekeeper 
# Conflicts:
#	dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserSettingsDao.java
#	dao/src/main/java/org/thingsboard/server/dao/sql/user/UserSettingsRepository.java
#	dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
#	dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java
#	dao/src/main/java/org/thingsboard/server/dao/user/UserSettingsDao.java
 2024-02-20 18:53:13 +02:00
Andrii Shvaika
decbbcb9cd Merge with master 2024-02-15 17:09:55 +02:00
ViacheslavKlimov
faa93de102 Tenant deletion with housekeeper 2024-02-15 14:26:33 +02:00