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

5609 Commits

Author SHA1 Message Date
Andrew Shvayka
e058786956
Merge pull request #8174 from zzzeebra/feature/junit5-migration-exceptions 
[3.5] junit5 migration - exception annotation refactoring
 2023-03-10 12:51:03 +02:00
Andrew Shvayka
20e4905e84
Merge pull request #8186 from thingsboard/feature/mqtt/sparkplug 
MQTT Sparkplug protocol support
 2023-03-10 12:45:59 +02:00
Andrii Shvaika
43f2e3b521 Fix case when test runs to fast (within 1 millisecond) 2023-03-10 12:42:56 +02:00
Andrii Shvaika
d7ee0fca91 Fix attribute subscription tests 2023-03-09 16:45:15 +02:00
ViacheslavKlimov
8fcbe876e8 Merge branch 'develop/3.5' into feature/notification-system 
# Conflicts:
#	pom.xml
 2023-03-08 18:16:16 +02:00
Andrii Shvaika
3477ddac0f Refactoring due to comments 2023-03-08 17:39:39 +02:00
Andrii Shvaika
85f317b99b Set default value to 0 for assign_ts for backward-compatibility 2023-03-08 15:19:18 +02:00
Andrii Shvaika
c905f20224 Merge remote-tracking branch 'origin/develop/3.5' into feature/mqtt/sparkplug 2023-03-08 13:27:17 +02:00
ViacheslavKlimov
a56261ac9d Merge with develop/3.5 2023-03-08 13:11:31 +02:00
Andrii Shvaika
c9b37237c1 Merge with develop/3.5 2023-03-07 16:21:57 +02:00
dashevchenko
58faac366b fixed upgrade script 2023-03-06 18:40:50 +02:00
Andrii Shvaika
aadf7f8295 Merge with develop/3.5 2023-03-06 17:59:37 +02:00
Oleksandra Matviienko
1ae8522bef junit5: BasicMqttCredentialsTest annotation exceptions refactoring 2023-03-06 15:38:50 +01:00
Oleksandra Matviienko
6ca287cc68 junit5: BaseTbResourceServiceTest annotation exceptions refactoring 2023-03-06 15:23:36 +01:00
Andrew Shvayka
07d985f20f
Merge pull request #8110 from dashevchenko/passwordHistoryTable 
Moved password history from tb_user to user_credentials
 2023-03-06 15:52:40 +02:00
Igor Kulikov
b6b61f3f54 UI: Minor fixes 2023-03-06 13:32:28 +02:00
Volodymyr Babak
4984a25210 Merge remote-tracking branch 'upstream/develop/3.5' into edge/solutions-template-updates 2023-03-06 11:55:06 +02:00
ViacheslavKlimov
a0796de0e4 Resolve merge conflicts 2023-03-06 10:45:32 +02:00
Vladyslav_Prykhodko
069ef4de5b Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system 2023-03-06 10:21:41 +02:00
AndriiD
5861520542 upd 2023-03-03 20:30:10 +02:00
AndriiD
808a384165 Merge branch 'master' into feature/work-remove-deprecated-handleException-usage 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/AssetController.java
#	application/src/main/java/org/thingsboard/server/controller/AuthController.java
#	application/src/main/java/org/thingsboard/server/controller/EdgeController.java
#	application/src/main/java/org/thingsboard/server/controller/RuleChainController.java
#	application/src/main/java/org/thingsboard/server/controller/UserController.java
 2023-03-03 20:02:52 +02:00
Igor Kulikov
639eb3459d Merge branch 'develop/3.5' into feature/angular15 2023-03-03 17:42:42 +02:00
Volodymyr Babak
3dacb805db Code review changes 2023-03-03 10:24:54 +02:00
Volodymyr Babak
c2b1a948da Removed check of deprecated entity alias filter type from backend to frontend 2023-03-03 10:17:42 +02:00
Volodymyr Babak
de2590ac78 Merge remote-tracking branch 'upstream/develop/3.5' into filter-type-multiple-types 2023-03-03 09:22:21 +02:00
nickAS21
0587933d5e sparkplug: validate namespace 2023-03-02 13:19:55 +02:00
dashevchenko
e5ba36a13b refactoring 2023-03-02 11:49:23 +02:00
dashevchenko
0c4ad9cc76 refactoring 2023-03-01 15:19:12 +02:00
dashevchenko
76f74766fd refactored upgrade to be executed with PostgreSQL 2023-03-01 14:23:53 +02:00
Andrew Shvayka
109ccccd14
Merge pull request #8147 from smatvienko-tb/feature/testcontainers-cassandra 
[3.5] Cassandra tests moved from cassandra-unit to testcontainers
 2023-03-01 12:30:45 +02:00
Andrew Shvayka
f0ca2d48f7
Merge pull request #8129 from smatvienko-tb/feature/web-service-handler-subscription-improvements 
[3.5] WebSocket subscription flow fix, WS refactoring and test improvements
 2023-03-01 12:26:59 +02:00
Sergey Matvienko
ddca3ffcf3 spring.test.context.cache.maxSize=1 removed as well as it always eq 1 during application tests (no performance effect) 2023-03-01 01:13:49 +01:00
Sergey Matvienko
1bf579288a tests: fixed test performance degradation (100% C2 Compiler) by removing -Xss384k and Mockito.clearAllCaches() 2023-03-01 01:05:19 +01:00
Sergey Matvienko
71d9f5ef68 Merge remote-tracking branch 'ce/develop/3.5' into feature/web-service-handler-subscription-improvements 2023-02-28 20:09:21 +01:00
Sergey Matvienko
9c6c06cb0b maintain message order for web socket: subscribed report (always first) further updates (never first) 2023-02-28 20:01:14 +01:00
Sergey Matvienko
56788caa1a DefaultTelemetryWebSocketService - removed static ObjectMapper, maps is final 2023-02-28 18:58:39 +01:00
ViacheslavKlimov
79670d9f9d Notification system improvements 2023-02-28 19:19:59 +02:00
Andrii Shvaika
6b121514fc Merge with develop/3.5 2023-02-28 19:06:54 +02:00
Andrii Shvaika
ce77d5d1bc Merge remote-tracking branch 'origin/feature/angular15' into feature/alarm-assign 2023-02-28 18:34:02 +02:00
Andrew Shvayka
0ba8336ee9
Merge pull request #8089 from dashevchenko/secureRNG 
Updated RNG for reset password token to secure one
 2023-02-28 18:26:21 +02:00
Sergey Matvienko
27f5f8c077 Cassandra tests moved from cassandra-unit to testcontainers 2023-02-28 16:31:54 +01:00
Igor Kulikov
d2876e7a79 Merge branch 'develop/3.5' into feature/angular15 2023-02-28 15:15:40 +02:00
dashevchenko
04c36916ed moved system env property 2023-02-28 14:53:57 +02:00
Andrii Shvaika
76b133376c Merge remote-tracking branch 'origin/develop/3.5' into feature/alarm-assign 2023-02-28 13:38:04 +02:00
dashevchenko
ecd923ba10 updated default value 2023-02-28 13:23:58 +02:00
dashevchenko
63a5a053a2 added try catch to not fail upgrade 2023-02-28 12:42:33 +02:00
Andrii Shvaika
b9cf5c7836 Improvement of the save alarm procedure 2023-02-28 12:03:59 +02:00
Andrew Shvayka
3e313371d1
Merge pull request #8143 from smatvienko-tb/feature/test-improvements-memory 
[3.5] Test improvements - memory
 2023-02-28 11:52:58 +02:00
Andrii Shvaika
6c160f5930 Backward compatibility of the alarm save call 2023-02-28 11:37:47 +02:00
Sergey Matvienko
24c930c699 spring.test.context.cache.maxSize=1 2023-02-27 22:19:50 +01:00