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

5179 Commits

Author SHA1 Message Date
dashevchenko
210aae6a86 updated alarm comment deletion 2023-03-14 14:15:37 +02:00
Andrii Shvaika
d5177f5bbf Fix attribute/RPC subscription tests 2023-03-14 13:52:21 +02:00
dashevchenko
d9b1e97bbb Merge remote-tracking branch 'upstream/develop/3.5' into alarmCommentFix 2023-03-14 12:19:57 +02:00
dashevchenko
2f59a74b65 added methods for RestClient, added system comment after comment deletion 2023-03-14 12:16:04 +02:00
Andrew Shvayka
7229b7bfd8
Merge pull request #8203 from volodymyr-babak/edge-test-fix 
sendUpdateSharedAttributeToCloudAndValidateDeviceSubscription - timeo…
 2023-03-14 10:59:55 +02:00
Andrew Shvayka
167fb722fa
Merge pull request #8210 from zzzeebra/feature/assertJ_exception_assertions 
[3.5] Rule ExpectedException refactored with AssertJ Exception Assertions
 2023-03-14 10:58:01 +02:00
Oleksandra Matviienko
3841deae24 BaseTbResourceServiceTest, BaseDeviceServiceTest: Rule ExpectedException refactored with AssertJ Exception Assertions 2023-03-13 23:08:19 +01:00
YevhenBondarenko
7cd949edb2 implemented system info 2023-03-13 20:05:49 +01:00
Andrii Shvaika
ab5769a252 Merge with develop/3.5 2023-03-13 15:52:06 +02:00
Andrew Shvayka
494296996e
Merge pull request #8200 from smatvienko-tb/fix/lwm2m-lifecycle-refactor 
[3.5] lwm2m lifecycle refactor
 2023-03-13 15:20:53 +02:00
YevhenBondarenko
b936d48419 implemented countEntitiesByTypes for SysAdmin 2023-03-13 10:57:04 +01:00
ViacheslavKlimov
378ae47acb Alarm comments rule trigger config, NotificationInfo stateEntityId 2023-03-13 10:41:40 +02:00
YevhenBondarenko
b13c9d7368 added curent tb version to the UpdateMessage 2023-03-11 21:29:39 +01:00
Volodymyr Babak
0e01f1c74d sendUpdateSharedAttributeToCloudAndValidateDeviceSubscription - timeout increased for run test stable on slow (busy) environments 2023-03-10 15:53:47 +02:00
Andrii Landiak
5bf7b6162e Fix sql schema 2023-03-10 15:48:52 +02:00
Andrii Landiak
e665917758 Merge branch 'develop/3.5' of github.com:AndriiLandiak/thingsboard into feature/x509-device-cert-impr 2023-03-10 15:46:42 +02:00
AndriiD
0b7b523978 upd 2023-03-10 15:05:05 +02:00
AndriiD
bf1be7bb07 Merge remote-tracking branch 'origin/develop/3.5' into feature/work-remove-deprecated-handleException-usage 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/AlarmController.java
#	application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java
 2023-03-10 14:54:39 +02:00
AndriiD
cbf451dc5e Merge remote-tracking branch 'origin/develop/3.5' into feature/work-remove-deprecated-handleException-usage 2023-03-10 14:48:07 +02:00
Sergey Matvienko
287999d46a test scope: logs for lwm2m.server 2023-03-10 12:37:10 +01:00
Sergey Matvienko
fed47f699c LwM2m lifecycle debug for the test scope 2023-03-10 12:16:41 +01:00
Sergey Matvienko
8352be035b LWM2M bean lifecycle dependency fix to avoid executors shutdown before server stop. Dependencies refactored: implementations replaced with interfaces. 2023-03-10 11:52:45 +01:00
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