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

9071 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Shvayka
851bed37fb
Merge pull request #5501 from ViacheslavKlimov/fix/bulk-import 
[3.3.2] Fix and refactor bulk importing
 2021-11-05 17:51:04 +02:00
Andrii Shvaika
9aecb1463a Merge branch 'fix/bulk-import' of https://github.com/ViacheslavKlimov/thingsboard 2021-11-05 17:46:03 +02:00
Igor Kulikov
423c17ab58 Add /v3/ path to ingress controller to handle new swagger resources 2021-11-05 17:35:40 +02:00
Viacheslav Klimov
f747c8280c Fix and refactor bulk importing 2021-11-05 16:14:53 +02:00
Dima Landiak
e9ba765565 added one more test for create relation node 2021-11-05 13:50:48 +02:00
Dima Landiak
e5ff6aba16 added create relation rule node test 2021-11-05 13:50:48 +02:00
Dima Landiak
d22209ed73 create relation rule node - corrected current relations deletion if selected, refactoring 2021-11-05 13:50:48 +02:00
van-vanich
c197f27d8e remove replace quote to method with a meaningful name. Also, remove split values to list to this method. 2021-11-05 12:16:52 +02:00
Igor Kulikov
ddb60eae40
Merge pull request #5495 from vvlladd28/improvemen/map/trip-animation 
[3.3.2 ]UI: Improvement trip animation: fixed calculate start/endpoint; fixed…
 2021-11-04 18:56:10 +02:00
Igor Kulikov
ac53463825
Merge pull request #5496 from vvlladd28/bug/widget-settings/not-load-advanced 
[3.3.2] UI: Fixed not load advanced settings in widget
 2021-11-04 18:54:02 +02:00
Yevhen Bondarenko
84b6a2a9df
Merge pull request #5494 from thingsboard/llwm2m_rename_bootstrap_credentials 
[3.3.3] LewM2M - profile&device rename
 2021-11-04 18:18:51 +02:00
Vladyslav_Prykhodko
5764287a12 UI: Improvement trip animation: fixed calculate start/endpoint; fixed update current position 2021-11-04 18:09:05 +02:00
Vladyslav_Prykhodko
df08320eea UI: Fixed not load advanced settings in widget 2021-11-04 18:05:13 +02:00
nickAS21
8f93f6dd06 lwm2m - profile&device rename 2021-11-04 17:37:19 +02:00
Andrew Shvayka
71bed873b0
Merge pull request #5166 from ViacheslavKlimov/fields-validation 
[3.3.2] Fields length validation
 2021-11-04 16:56:14 +02:00
Andrii Shvaika
de1a56a488 CoAP ack/confirmable mess fixing 2021-11-04 16:54:21 +02:00
Igor Kulikov
4c275888ec Merge branch 'master' of github.com:thingsboard/thingsboard 2021-11-04 16:36:26 +02:00
Igor Kulikov
ce82ca0b1f Fix packaging to substitute properties in package yml 2021-11-04 16:36:14 +02:00
Swoq
52d626882b Fix exception after changing polygon on widget 2021-11-04 16:34:31 +02:00
Yevhen Bondarenko
ad5d1188e4
Merge pull request #5488 from thingsboard/lwm2m_profile_bootstrap_base64 
[3.3.2] Lwm2m profile bootstrap base64
 2021-11-04 16:32:14 +02:00
nickAS21
4efa360f5c lwm2m - profile fix bug server config 2021-11-04 16:26:44 +02:00
Viacheslav Klimov
17f9eebe23 Set serialVersionUIDs for cached entities 2021-11-04 16:25:15 +02:00
Igor Kulikov
0725a27d51 Update rule nodes UI 2021-11-04 15:59:13 +02:00
Igor Kulikov
668f1dda2a Merge branch 'master' of github.com:thingsboard/thingsboard 2021-11-04 15:26:49 +02:00
Igor Kulikov
7c2b3a9fbf Improve REST API error response handling. Update swagger api. 2021-11-04 15:26:36 +02:00
Sergey Matvienko
9e71c0b9fe EntityDataAdapterTest added to verify convertValue method 2021-11-04 14:50:11 +02:00
Andrii Shvaika
a8aca14e74 Merge branch 'feature/efento-water-meter' of https://github.com/ShvaykaD/thingsboard 2021-11-04 13:25:17 +02:00
Viacheslav Klimov
ab0ad885ab Entities text search by substring in JPA repositories 2021-11-04 13:19:42 +02:00
Andrew Shvayka
2166003adc
Merge pull request #5470 from dmytro-landiak/tb-re-processing-strategy-factory-fix 
[3.3.2] Fixed analyze reprocessing decision in TbRuleEngineProcessingStrategyFactory
 2021-11-04 13:16:02 +02:00
Andrew Shvayka
d78c1b2de4
Update TbRuleEngineProcessingStrategyFactory.java 2021-11-04 13:15:13 +02:00
Andrii Shvaika
e18d834461 Code style improvements 2021-11-04 13:07:05 +02:00
Swoq
5599ab5650 Refactoring Device Profile upgrade 2021-11-04 13:04:15 +02:00
Swoq
22ce8cf063 Fix upgrade from version 3.2.2 2021-11-04 13:04:06 +02:00
Andrii Shvaika
88773ade70 Merge branch 'develop/3.3.2' of https://github.com/Swoq/thingsboard into develop/3.3.2 2021-11-04 13:03:13 +02:00
Andrii Shvaika
083372ae09 Merge branch 'develop/3.3.2' of github.com:thingsboard/thingsboard into develop/3.3.2 2021-11-04 13:03:02 +02:00
Viacheslav Klimov
fe5215c7cc Minor refactoring 2021-11-04 12:55:23 +02:00
Viacheslav Klimov
2d845c7840 Merge remote-tracking branch 'origin/master' into fields-validation 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
#	common/data/src/main/java/org/thingsboard/server/common/data/Customer.java
#	common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfile.java
#	common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java
#	common/data/src/main/java/org/thingsboard/server/common/data/OtaPackageInfo.java
#	common/data/src/main/java/org/thingsboard/server/common/data/TbResource.java
#	common/data/src/main/java/org/thingsboard/server/common/data/TbResourceInfo.java
#	common/data/src/main/java/org/thingsboard/server/common/data/TenantProfile.java
#	common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java
#	common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java
#	common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelation.java
#	common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java
#	common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java
#	common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetsBundle.java
 2021-11-04 12:43:54 +02:00
van-vanich
a9b3f409f3
Merge branch 'thingsboard:master' into command_in 2021-11-04 12:31:49 +02:00
Igor Kulikov
cd23b85baa Bump hsqldb version to 2.6.1 to fix sql timeout issues 2021-11-04 11:15:44 +02:00
nickAS21
82704d54d0 lwm2m - profile (Base64 validate) 2021-11-04 07:58:58 +02:00
nickAS21
bad6653a50 lwm2m - update lwm2mController by base64 and createte BootstrpServerCredentials by Profile (Base64 validate) 2021-11-03 23:28:28 +02:00
Igor Kulikov
a3206358c7 Merge branch 'master' of github.com:thingsboard/thingsboard 2021-11-03 19:30:11 +02:00
Igor Kulikov
7f1559f170 Fix swagger redirect 2021-11-03 19:29:56 +02:00
Igor Kulikov
6417ef7cd0
Merge pull request #5486 from ArtemDzhereleiko/imp/widget-settings/no-data-message 
[3.2.2] UI: New widget settings with input field no data message
 2021-11-03 18:51:38 +02:00
Igor Kulikov
c765282454 Update swagger version 2021-11-03 18:46:44 +02:00
Vladyslav_Prykhodko
d53d4362b7 UI: Refactoring noDataDisplayMessageText 2021-11-03 17:57:00 +02:00
Igor Kulikov
f22c421acd
Merge pull request #5485 from vvlladd28/improvement/nav-tree/updated-node 
[3.3.2] UI Improvement: added argument updatedData in function updateNode in …
 2021-11-03 17:14:17 +02:00
Igor Kulikov
6e2f1ccf57 Merge branch 'master' of github.com:thingsboard/thingsboard 2021-11-03 17:12:19 +02:00
Igor Kulikov
2aa7170dba Update swagger properties 2021-11-03 17:12:05 +02:00
Vladyslav_Prykhodko
2a9b28ddc3 UI Improvement: added argument updatedData in function updateNode in nav-tree component 2021-11-03 17:06:09 +02:00