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

780 Commits

Author SHA1 Message Date
Andrii Shvaika
90f7ff57d5 Entity Relations Draft 2021-10-13 16:37:59 +03:00
Andrii Shvaika
afbf18d803 Merge event filters 2021-10-13 16:22:50 +03:00
Andrew Shvayka
37d3b424f9
Merge pull request #5364 from smatvienko-tb/relation-query-improvements 
Relation query improvements (handle many relations between two entities, break loops, limit max level)
 2021-10-13 16:12:41 +03:00
Andrii Shvaika
2e187df448 Merge branch 'feature/swagger-alarm-controller' of https://github.com/ShvaykaD/thingsboard into feature/swagger 2021-10-13 14:43:36 +03:00
ShvaykaD
4aef440431 merge with upstream 2021-10-13 13:46:11 +03:00
ShvaykaD
4be37230ce fix typos 2021-10-13 13:24:50 +03:00
Dima Landiak
d1974e9b04 swagger description for event controller 2021-10-13 13:19:08 +03:00
Andrii Shvaika
2fea8570b7 Merge branch 'feature/swagger-alarm-controller' of https://github.com/ShvaykaD/thingsboard into feature/swagger 2021-10-13 12:56:38 +03:00
Mariia Synelnyk
a126b888da
add docs for audit-log controller (#12) 
* added swagger docs for audit logs controller

* add api mpdel to AuditLog class

* added produces to @ApiOperation in AuditLogController
 2021-10-13 12:47:49 +03:00
ShvaykaD
3fda67be48 swagger docs for Alarm Controller 2021-10-13 12:42:00 +03:00
Dima Landiak
041582b9c7 entity relation controller description 2021-10-13 10:28:22 +03:00
Andrew Shvayka
ab356a4bc9
Merge pull request #5279 from thingsboard/feature/swagger 
Swagger Annotations to improve the auto-generated REST API doc.
 2021-10-12 19:43:51 +03:00
Andrii Shvaika
8cb0622dac Merge asset docs 2021-10-12 19:40:41 +03:00
Andrii Shvaika
c50dd443c6 Dashboard controller 2021-10-12 19:29:10 +03:00
Dima Landiak
638b116917 Merge branch 'feature/swagger' into feature/swagger-asset 2021-10-12 18:59:41 +03:00
Dima Landiak
da2ff5e4ff Asset Controller Description 2021-10-12 18:55:29 +03:00
Sergey Matvienko
2d2bd2c158 reverted unnecessary declaration for maven-surefire-plugin on common/data where only simple test present (will run by default) 2021-10-12 18:12:08 +03:00
Sergey Matvienko
7f3d63512e tests: added license header 2021-10-12 17:52:41 +03:00
Sergey Matvienko
18800c57c8 tests: added first test to the common/data package (maven plugin added as well) 2021-10-12 17:51:23 +03:00
Andrii Shvaika
ca89a4fc0e Component Descriptor documentation 2021-10-12 16:17:34 +03:00
Andrii Shvaika
e755f3f6ed Description of the Auth Controller 2021-10-12 15:19:38 +03:00
Andrii Shvaika
e6e05c9b88 Admin Controller description 2021-10-11 17:26:29 +03:00
Viacheslav Klimov
2814c377ac Refactor rule chains importing 2021-10-11 16:29:46 +03:00
Andrii Shvaika
d6370ed64d Documentation for PageData, DeviceSearchQuery and DeviceInfo 2021-10-11 15:47:33 +03:00
ShvaykaD
845d8247dd
[3.3.2] MQTT short topics support (#4967) 
* added mqtt short topics support

* remove volatile keyword from topic types parameters

* added new tests for mqtt short topics

* fix compilation error after merge

* improvements/typo-fixes after pull request review
 2021-10-08 15:20:38 +03:00
Andrii Shvaika
5285cec69d Swagger Documentation for Save Device and Update Device Credentials 2021-09-24 18:51:31 +03:00
Andrii Shvaika
1de3f4d513 Code cleanup 2021-09-24 15:40:52 +03:00
Andrii Shvaika
70679258d6 Swagger annotations for saveDeviceCredentials 2021-09-24 15:32:53 +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
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
049627db97 Version set to 3.3.2-SNAPSHOT 2021-09-06 18:55:10 +03:00
Swoq
3fc72e3d6f Fix logging exceptions of controllers 2021-09-02 16:26:58 +03:00
Swoq
827da31d92 Validation fixes 2021-09-02 10:23:02 +03:00
Igor Kulikov
02b8b8b873
Merge branch 'master' into dependency-upgrade-test-scope 2021-09-01 14:57:02 +03:00
Swoq
da5758b798 ThingsboardErrorResponseHandler now work with: 
- IllegalArgumentException, IncorrectParameterException, DataValidationException, MessagingException.
They aren't considered to be an internal server error now.
 2021-08-30 18:05:09 +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
Igor Kulikov
fcba39e4ba
Merge pull request #5093 from vvlladd28/improvement/widget-type-details/order 
[3.3.1] Change json property order in model WidgetTypeDetails
 2021-08-25 12:38:30 +03:00
Andrii Shvaika
e5b988a297 Merge branch 'rpc-improvements' of https://github.com/YevhenBondarenko/thingsboard into develop/3.3.1 2021-08-19 18:04:32 +03:00
YevhenBondarenko
d49bee4b31 send next rpc after removing 2021-08-18 19:27:48 +03:00
YevhenBondarenko
2a2441b248 used timeout from yml 2021-08-18 16:46:01 +03:00
YevhenBondarenko
8513c99903 added sequence for the all RPC 2021-08-18 09:56:57 +03:00
YevhenBondarenko
8869dc0cb0 added new RPC statuses 2021-08-17 13:25:24 +03:00
Vladyslav_Prykhodko
8c0c6bdcff Change json property order in model WidgetTypeDetails 2021-08-17 10:00:03 +03:00
Andrii Shvaika
3661647c3a Version set to 3.3.1-SNAPSHOT 2021-08-16 12:39:43 +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
YevhenBondarenko
d44adcfe75 added removing rpc request from pending map after rpc deleting 2021-08-06 17:34:23 +03:00
Andrii Shvaika
2078c71d32 Added module cluster-api and used it in rule engine and other services 2021-08-06 17:33:52 +03:00