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

812 Commits

Author SHA1 Message Date
Andrew Shvayka
c93772273c
Merge pull request #6642 from ViacheslavKlimov/fix/device-profile-permissions-checks 
[3.4] Fix permission checks for DeviceProfileController
 2022-06-22 13:02:09 +03:00
Andrew Shvayka
4c6f817e05
Merge pull request #6781 from volodymyr-babak/feature/edge-add-ota-updates 
[3.4] Edge OTA support
 2022-06-22 12:47:51 +03:00
nickAS21
5f73066602 resolve conflicts 2022-06-22 12:32:53 +03:00
Andrew Shvayka
f80583db72
Merge pull request #6600 from volodymyr-babak/feature/edge-converters-integration 
[3.4] Edge integrations/converters support
 2022-06-22 11:45:44 +03:00
Andrii Shvaika
02f61cea79 Merge PR #5924 2022-06-22 11:03:32 +03:00
Andrii Shvaika
f5603c4f72 Merge with develop/3.4 2022-06-21 17:57:19 +03:00
Volodymyr Babak
2bf8e9d5b4 Add implementation and test for ota package contructor 2022-06-21 17:53:30 +03:00
Andrew Shvayka
11e43aa68e
Merge pull request #6686 from YevhenBondarenko/fix/vulnerabilities 
[3.4]  fix vulnerabilities
 2022-06-21 17:20:32 +03:00
Volodymyr Babak
3b3a41a2ec Merge remote-tracking branch 'origin/develop/3.4' into feature/edge-add-ota-updates 2022-06-21 16:45:23 +03:00
Volodymyr Babak
a5f0f1d04c Fixed compilation error 2022-06-20 22:54:18 +03:00
Igor Kulikov
5e9899daad UI: Implement progress on single entity version create request. 2022-06-20 19:48:29 +03:00
Andrew Shvayka
72944d8a1f
Merge pull request #6736 from ViacheslavKlimov/vc-improvements 
VC tests refactoring
 2022-06-20 16:01:40 +03:00
Andrii Shvaika
7a4fec93cd Fix re-import of rule chains, and different not related test 2022-06-18 09:28:54 +03:00
Volodymyr Babak
3912aadf72 Added otapackage support for edge - part #1 2022-06-17 18:26:32 +03:00
Viacheslav Klimov
1d8a2a0885 Fix testExternalIdsInExportData 2022-06-17 12:06:51 +03:00
Viacheslav Klimov
86c5d18116 Tests for external ids in export data 2022-06-17 11:37:28 +03:00
Viacheslav Klimov
49a83d3e18 Fix tests 2022-06-16 18:17:12 +03:00
Viacheslav Klimov
6e27ed46d6 Merge remote-tracking branch 'origin/feature/entities-version-control' into vc-improvements 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/BaseEntityImportService.java
#	application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java
#	common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/EntityImportSettings.java
 2022-06-16 12:36:27 +03:00
Viacheslav Klimov
3581172e8f Tests for export/import api 2022-06-16 12:32:12 +03:00
Andrii Shvaika
829a3e257e Merge with develop/3.4 2022-06-16 08:35:56 +03:00
Igor Kulikov
c4bdee92db PSQL annotation and dialect cleanup. 2022-06-15 14:04:13 +03:00
nickAS21
eceec2af0c Merge branch 'develop/3.4' into refactoring_tests_alarm_customer 
refactoring: alarm resolving the conflict
 2022-06-15 12:24:29 +03:00
Andrew Shvayka
a9cad82371
Merge pull request #6352 from desoliture1/subCustomerAlarmsCheckerTestsFix 
[3.4] Tests for Alarms availability with users hierarchy
 2022-06-14 19:17:27 +03:00
nickAS21
281c266d26 refactoring: commit3 (error) 2022-06-14 17:00:55 +03:00
nickAS21
c9558b5e08 refactoring: commit2 (error) 2022-06-14 16:59:21 +03:00
nickAS21
6d2d876d64 refactoring: commit1 2022-06-14 14:45:42 +03:00
nickAS21
eab4e333a9 refactoring: alarm - add Mockito to create 2022-06-14 12:03:05 +03:00
nickAS21
258417346f refactoring: customer - test start 2022-06-14 09:16:32 +03:00
Igor Kulikov
18ec32f092 Merge with develop/3.4 2022-06-13 12:20:08 +03:00
nickAS21
0cd24bb16e refactoring: alarm - test start 2022-06-12 20:28:12 +03:00
YevhenBondarenko
08d5cb5e93 migrated spring boot to version 2.7 due to vulnerabilities 2022-06-11 15:05:14 +02:00
Viacheslav Klimov
3b70c334cc Update 2fa tests 2022-06-07 13:04:37 +03:00
Andrii Shvaika
623f621d64 Merge remote-tracking branch 'origin/develop/3.4' into feature/entities-version-control 2022-06-06 15:21:04 +03:00
YevhenBondarenko
ac751b09f9 fixed hash partition service initialization 2022-06-06 09:17:19 +02:00
Andrew Shvayka
6173795580
Merge pull request #6519 from volodymyr-babak/bug-edge-device-profile-non-default-transport 
[3.4] [Bug] Device profile with non default transport is not propagated to edge
 2022-06-03 15:23:36 +03:00
Igor Kulikov
636b561f72 Merge with develop/3.4 2022-06-03 15:08:39 +03:00
nickAS21
f38040f5f9 Merge branch 'develop/3.4' into refactoring_07_OtaPackage_08_RuleChain_09_TbResource 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/entitiy/AbstractTbEntityService.java
 2022-06-02 19:53:33 +03:00
Andrii Shvaika
63750ef8a0 Merge with develop/3.4 2022-06-02 13:59:15 +03:00
YevhenBondarenko
44403cd2c2 merge with develop/3.4 2022-06-01 21:55:34 +02:00
nickAS21
a60f67dab6 refactoring: comments7 (Resource) 2022-06-01 19:58:09 +03:00
Vladyslav_Prykhodko
9fd78e595c Fixed testі 2022-06-01 10:44:13 +03:00
Vladyslav_Prykhodko
fd6ead6c48 Fixed test 2022-06-01 10:02:23 +03:00
Viacheslav Klimov
18083f1094 Merge remote-tracking branch 'zhenya/feature/queue-entity' into vc-improvements 2022-05-31 16:10:15 +03:00
Viacheslav Klimov
906d421f2d Merge branch 'develop/3.4' into feature/2fa 2022-05-26 17:44:38 +03:00
YevhenBondarenko
2c862b138f added update queue config tests 2022-05-25 11:53:40 +02:00
Andrii Shvaika
dbec05a2c1 Test fix 2022-05-25 10:39:48 +03:00
Viacheslav Klimov
7c1d0fb646 Permission check for getDeviceProfileInfoById 2022-05-24 12:50:45 +03:00
Viacheslav Klimov
509962932c Change verificationCodeSendRateLimit to minVerificationCodeSendPeriod 2022-05-20 14:55:37 +03:00
Viacheslav Klimov
f2a4ebb136 'verificationCode' variable to 'code' in SMS 2FA message template 2022-05-20 12:50:06 +03:00
Andrii Shvaika
62c5c73237 Merge with queue API 2022-05-20 10:59:05 +03:00