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

1490 Commits

Author SHA1 Message Date
Sergey Matvienko
87b3de09ad Merge branch 'master' into feature/sql-query-timeout 
# Conflicts:
#	dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaEdgeDao.java
#	dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java
 2021-10-12 14:19:10 +03:00
Volodymyr Babak
427e7ac094 Added swagger API for edge event controller. Added search text usage for edge event type. Code cleanup 2021-10-12 12:58:25 +03:00
Viacheslav Klimov
2814c377ac Refactor rule chains importing 2021-10-11 16:29:46 +03:00
Mykhailo Kratiuk
0026857e27
[3.3.2] Fix bug while deleting devices with relations to one another (#5310) 
* Fix bug while deleting devices with relations to one another

* Change log level from error to debug

* Made try catch block more precise
 2021-10-11 13:20:16 +03:00
Viacheslav Klimov
a098bf0bf9 Implement concurrent bulk import processing 2021-10-06 18:05:02 +03:00
nickAS21
9186377b97 Lwm2m base64 back fix bug "bas64" on review 2021-09-30 12:24:29 +03:00
nickAS21
e8444f8bdc Lwm2m base64 back fix bug "bas64" and x509 empty 2021-09-29 19:32:19 +03:00
nickAS21
d403afb0e6 Lwm2m credentials base64 validate (with /n and "...BEGIN...") back 2021-09-28 14:11:32 +03:00
nickAS21
287657ae86 Lwm2m credentials base64 validate back 2021-09-27 17:54:28 +03:00
nickAS21
16a520cd80 Lwm2m Fix bug review last 2021-09-17 19:20:05 +03:00
nickAS21
b297ab231c Lwm2m Fix bug create new Device with X509 Trust / update credential to X509 trust 2021-09-16 08:43:28 +03:00
nickAS21
9e9a8238db Merge branch develop/3.3.2 into current 2021-09-13 19:01:04 +03:00
nickAS21
1b6fc7d72b Merge branch 'develop/3.3.2' into lwm2m_tests_with_cherry 
# Conflicts:
#	application/src/test/java/org/thingsboard/server/transport/lwm2m/security/AbstractLwM2MIntegrationTest.java
#	application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/PskLwm2mIntegrationTest.java
#	common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
#	dao/pom.xml
#	dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java
 2021-09-13 18:15:58 +03:00
YevhenBondarenko
bf3a88752c LwM2M X509 credentials improvements 2021-09-10 19:41:52 +03:00
YevhenBondarenko
ccc18ec75b LwM2M tests improvements 2021-09-10 17:05:43 +03:00
YevhenBondarenko
ffe16b8dfb Merge remote-tracking branch 'upstream/master' into feature/bulk-import/device-credentials 
# Conflicts:
#	ui-ngx/src/app/modules/home/components/import-export/import-export.service.ts
 2021-09-09 17:18:28 +03:00
YevhenBondarenko
fe2427e99f added validation for lwm2m device credentials 2021-09-09 17:04:54 +03:00
nickAS21
8dbacbd65f lwm2m: add to JacksonUtil new method "validateFieldsToTree" 2021-09-09 07:46:35 +03:00
nickAS21
d491e0f664 lwm2m: Security key validate in dao 2021-09-08 22:12:08 +03:00
Viacheslav Klimov
3f5e77abb7 Check credentials type for null when saving 2021-09-08 18:37:34 +03:00
Viacheslav Klimov
d14f6a4ddd Refactor device bulk import 2021-09-07 18:52:29 +03:00
Viacheslav Klimov
bd1cfa4491 Merge branch 'master' into feature/bulk-import/device-credentials 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/EdgeController.java
 2021-09-07 16:32:22 +03:00
Igor Kulikov
b173e0799c Update OS package plugin version. Code cleanup. 2021-09-07 11:47:43 +03:00
Igor Kulikov
1bfe1bb61e Save and flush device during transaction to trigger constraint validation. 2021-09-02 19:43:10 +03:00
Igor Kulikov
08c8482f06 Revert "Handle Device service transactional methods exceptions (fix exception handling for devices with same name)" 
This reverts commit b67f454b
 2021-09-02 19:08:34 +03:00
Igor Kulikov
b67f454ba0 Handle Device service transactional methods exceptions (fix exception handling for devices with same name) 2021-09-02 15:54:17 +03:00
Swoq
827da31d92 Validation fixes 2021-09-02 10:23:02 +03:00
Swoq
57cec85bb1 Tests fix 2021-09-01 18:31:09 +03:00
Swoq
6f1a5ea54a Tests fix 2021-09-01 18:12:17 +03:00
Swoq
e41768f2c8 Tests fix 2021-09-01 17:52:39 +03:00
Viacheslav Klimov
b84b505d9b Refactor 2021-09-01 17:44:11 +03:00
Sergey Matvienko
8601121e7e executors: named fixed thread pools; tests - added executor shutdown on tearDown 2021-09-01 14:08:03 +03:00
Igor Kulikov
76da0a0de5
Merge pull request #5164 from vvlladd28/bug/reset-password/case-sensitive 
[3.3.1]Fixed has not been used property SECURITY_USER_LOGIN_CASE_SENSITIVE on password recover
 2021-08-31 15:57:54 +03:00
Igor Kulikov
f5056715af
Update UserServiceImpl.java 2021-08-31 15:57:38 +03:00
Viacheslav Klimov
f15f0e5483 Merge branch 'master' into fields-validation 
# Conflicts:
#	common/data/src/main/java/org/thingsboard/server/common/data/OtaPackageInfo.java
#	ui-ngx/src/app/modules/home/pages/admin/resource/resources-library.component.ts
#	ui-ngx/src/assets/locale/locale.constant-en_US.json
 2021-08-30 11:14:04 +03:00
Vladyslav_Prykhodko
b8daa49736 Fixed has not been used property SECURITY_USER_LOGIN_CASE_SENSITIVE on password recover 2021-08-30 10:58:42 +03:00
Andrew Shvayka
f47985ccc6
Merge pull request #5157 from thingsboard/develop/3.3.1 
Refactoring: Introduced Edge License service.
 2021-08-27 16:01:26 +03:00
Andrew Shvayka
78fe8b0150
Merge pull request #5155 from thingsboard/develop/3.3.1 
Refactoring: Introduced Edge License service. Remove web dependency f…
 2021-08-27 15:55:22 +03:00
Andrii Shvaika
37fd7f4988 Validation and Replacement of Queue names in the Device profile 2021-08-26 15:51:59 +03:00
Volodymyr Babak
6f9ac66863 Refactoring: Introduced Edge License service. Remove web dependency from dao 2021-08-25 15:59:26 +03:00
Volodymyr Babak
5007eccb26 Added logs for edge license check. Replaced Object class with JsonNode 2021-08-20 13:14:18 +03:00
Sergey Matvienko
d4a2e5a52a device service: transactional for saveDeviceWithAccessToken and saveDeviceWithCredentials 2021-08-12 20:08:42 +03:00
Sergey Matvienko
ecca0e5df3 device service cache eviction fix for saveDeviceWithCredentials 2021-08-12 19:18:45 +03:00
Igor Kulikov
82a66a9421 Fix device service cache. Configure maven surefire plugin to execute both test suits and single tests. 2021-08-12 18:27:27 +03:00
Igor Kulikov
eb8f115c69 Fix device cache 2021-08-12 16:56:39 +03:00
Viacheslav Klimov
e33a336ed9 Merge remote-tracking branch 'origin/master' into feature/bulk-import/device-credentials 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/DeviceController.java
#	application/src/main/java/org/thingsboard/server/controller/EdgeController.java
#	common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceService.java
#	ui-ngx/src/app/core/http/device.service.ts
 2021-08-09 12:27:53 +03:00
Viacheslav Klimov
3505810280 Bulk import device credentials handling refactoring 2021-08-05 15:13:05 +03:00
YevhenBondarenko
373f2f9f0e added additionalInfo to the rpc 2021-08-05 15:12:00 +03:00
Igor Kulikov
017dde8c55
Merge pull request #4993 from vvlladd28/improvement/mail-setting/edit-password 
[3.3.0] Mail server settings improvement change password
 2021-08-04 18:37:43 +03:00
Viacheslav Klimov
33592ca072 Bulk import for devices, assets and edges 2021-08-03 16:00:47 +03:00