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

267 Commits

Author SHA1 Message Date
ViacheslavKlimov
3124ad360d Merge branch 'master' of github.com:thingsboard/thingsboard into improvements/dashboard-export 2024-11-18 15:46:23 +02:00
YevhenBondarenko
f54e1882bf Refactored due to common use of debug mode configuration 2024-11-13 13:56:46 +01:00
ViacheslavKlimov
155b22accf Move resource url from id to url; add etag to export data 2024-11-01 11:47:40 +02:00
Vladyslav_Prykhodko
d29ca15af9 Merge remote-tracking branch 'upstream/master' into feature/mobile-app-bundle 2024-10-24 13:22:35 +03:00
dashevchenko
fb87cd6df7 refactoring 2024-10-21 18:54:22 +03:00
ViacheslavKlimov
52a6499d1c Export/import used resources along with dashboard and widget type 2024-10-18 12:50:03 +03:00
ViacheslavKlimov
f5c4bc5076 Merge branch 'feature/dashboard-sync' into improvements/dashboard-export 2024-10-17 14:37:01 +03:00
ViacheslavKlimov
84fd3129ee Load gateways dashboard on install/upgrade 2024-10-17 13:37:38 +03:00
ViacheslavKlimov
cb097bb637 Change dashboard export structure; images export-import improvements 2024-10-15 17:08:15 +03:00
Igor Kulikov
b4124f7c4c Merge with RC 2024-09-26 11:10:56 +03:00
Igor Kulikov
4d705f26fd Version set to 3.8.0-RC 2024-09-26 11:09:26 +03:00
Igor Kulikov
3dadc34b5b Version set to 3.9.0-SNAPSHOT 2024-09-26 10:38:27 +03:00
Igor Kulikov
025fb1ca8c Version set to 3.8.0 2024-09-26 09:46:57 +03:00
Dmytro Skarzhynets
bbe328d158 Implemented safe scheduled thread pool 2024-09-18 19:46:17 +03:00
Dmytro Skarzhynets
c5ae013ce3 [WIP] draft of safe scheduled executor 2024-09-17 20:08:13 +03:00
Andrew Shvayka
73921e5480
Merge pull request #10100 from livk-cloud/fix-file-not-found 
fix: fixed the error that the file could not be found after packing
 2024-09-10 15:22:24 +03:00
ViacheslavKlimov
7007563627 Merge remote-tracking branch 'origin/hotfix/3.7' into master-hotfix 2024-08-06 19:46:05 +03:00
ViacheslavKlimov
5759610340 Rate limit for WS subscriptions 2024-08-05 17:22:58 +03:00
Andrii Landiak
5ca6ad03e3 CE: optimize java imports 2024-08-01 11:12:10 +03:00
Igor Kulikov
468c007882 Version set to 3.7.1-SNAPSHOT 2024-06-20 15:53:41 +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
Andrew Shvayka
aecf654d65
Merge pull request #10201 from thingsboard/feature/housekeeper 
Housekeeping service
 2024-04-26 13:37:06 +03:00
Sergey Matvienko
16490e1e2f optionalMappingJDK8ModuleTest added 2024-04-23 11:16:40 +02:00
Sergey Matvienko
be07937df9 JacksonUtil merged with downstream 2024-04-23 11:07:36 +02:00
Sergey Matvienko
1f1086f106 JacksonUtil Jdk8Module added along with jackson-datatype-jdk8 dependency to address the Optional mapping 2024-04-23 11:00:35 +02:00
Sergey Matvienko
e3f2974fcd dependency: bouncycastle jdk15on moved to jdk18on 2024-04-19 23:25:15 +02: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
Igor Kulikov
ce44bbc248 Merge with hotfix/3.6.3 2024-04-11 17:52:26 +03:00
ViacheslavKlimov
49a76cad5a Housekeeper: disabled task types; refactoring 2024-04-11 11:53:32 +03:00
Viacheslav Klimov
9cc0e9da7c
Merge pull request #10349 from irynamatveieva/feature/mqtt-node 
MQTT node: added ability to send string without quotes.
 2024-04-09 13:08:00 +03:00
ViacheslavKlimov
641008c262 onClick action from mobile notification center 2024-04-08 14:00:00 +03: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
IrynaMatveieva
242b712a90 fixed conflicts 2024-03-22 12:35:59 +02:00
IrynaMatveieva
837933a2e0 moved the static toPlainText() method to the JacksonUtil class 2024-03-12 18:53:45 +02:00
IrynaMatveieva
0177b5fdc7 added a method for getting a password with a null checking 2024-03-06 17:56:51 +02:00
dashevchenko
6a755ab0b7 deleted java keystore type of creds support 2024-02-06 15:10:09 +02:00
livk
8779c629e7 fix: fixed the error that the file could not be found after packing 2024-01-31 14:17:39 +08:00
dashevchenko
9af96ad5be resolved conflicts after merge 2024-01-18 14:39:14 +02:00
Andrii Shvaika
5acf527f1a Version set to 3.7.0-SNAPSHOT 2024-01-16 11:43:44 +02:00
YevhenBondarenko
60be820915 merge with master 2024-01-15 18:51:00 +01:00
Igor Kulikov
c5a72ed8df Update license header to 2024 year. 2024-01-09 10:46:16 +02:00
YevhenBondarenko
61602330ec merge with 3.7 2023-12-28 12:16:14 +01:00
Igor Kulikov
bc35df1dd7 Version set to 3.6.3-SNAPSHOT 2023-12-27 12:58:15 +02:00
YevhenBondarenko
feb44656f1 merge with master 2023-12-26 00:58:31 +01:00
YevhenBondarenko
5869378c2c Implemented Json serialization, added custom serializer for the Device redis cache 2023-12-14 20:02:53 +01:00
Andrii Landiak
67aa74f1dc Merge remote-tracking branch 'upstream/master' into feature/edge-json-refactoring 2023-12-05 13:49:43 +02:00
Andrii Shvaika
fc698b4f31 Revert changes to JacksonUtil 2023-12-05 13:22:59 +02:00
Andrew Shvayka
6a0a5750e0
Merge pull request #9768 from thingsboard/fix_bug_tbDate_default_Tz 
[3.6.2]Fix_bug_Tbdate_default_tz
 2023-12-05 12:59:02 +02:00
nick
240cd25cf4 tbel fix_bug tbDate parse toString with Object Mapper 2023-12-04 19:10:22 +02:00
ViacheslavKlimov
ebfab0e941 Merge branch 'master' into feature/image-resources 2023-12-04 12:57:57 +02:00