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

4364 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vladyslav_Prykhodko
e3b8c28bc6 Add sorting object key 2020-08-11 13:43:37 +03:00
Mrkartoshka
9413b68ebf Editable polygons 2020-08-11 13:36:13 +03:00
Mrkartoshka
5596bd9f61 Merge branch 'master' of https://github.com/thingsboard/thingsboard into editable-polygons 
 Conflicts:
	ui-ngx/package-lock.json
	ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts
	ui-ngx/src/app/modules/home/components/widget/lib/maps/map-models.ts
	ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts
	ui-ngx/src/app/modules/home/components/widget/lib/maps/polygon.ts
	ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/image-map.ts
 2020-08-11 12:04:34 +03:00
Mrkartoshka
0fdd7f3544 Fixed types 2020-08-11 11:40:41 +03:00
Valerii Sosliuk
86779276cc Use metadata keys in originator attribute/telemetry nodes 2020-08-11 11:39:51 +03:00
Mrkartoshka
c661343a32 Fixed types 2020-08-11 11:37:43 +03:00
Andrii Shvaika
2dac896f1b Additional Info fix 2020-08-11 11:32:42 +03:00
Yevhen Bondarenko
e318b193bd
Develop/2.5.3 confluent cloud (#3259) 
* added other parameters for queue kafka

* Added support Confluent Cloud

* fix js executor kafka connection

* refactored
 2020-08-11 11:15:41 +03:00
Andrii Shvaika
10dd5c352f Max entities for data subscription over WS 2020-08-11 10:39:13 +03:00
Valerii Sosliuk
87b23f4989 Display sorted metadata keys in rule nodes 2020-08-10 23:34:52 +03:00
Mrkartoshka
423a491e80 Editable Polygons without proper typings 2020-08-10 22:52:26 +03:00
Igor Kulikov
e8e2f21193 Map widgets fixes 2020-08-10 20:05:11 +03:00
Igor Kulikov
6b53e84c84
Merge pull request #3273 from vvlladd28/bug/update/state-id 
[3.0] Fix update state id value
 2020-08-10 16:34:16 +03:00
Vladyslav_Prykhodko
f5f6d4b917 Fix update state id value 2020-08-10 16:32:36 +03:00
Igor Kulikov
8e78589b64
Merge pull request #3272 from vvlladd28/improvement/map/calculate-function2 
[3.0] Fix calculation value in function for map widget
 2020-08-10 16:14:18 +03:00
Vladyslav_Prykhodko
31d0425cd8 Fix calculation value in function for map widget 2020-08-10 16:09:38 +03:00
Igor Kulikov
a0ae28f2be Fix autocomplete text for Current User Owner 2020-08-10 15:41:57 +03:00
Igor Kulikov
e7aae9664a Add new alias entity type - Current User Owner 2020-08-10 15:34:23 +03:00
Igor Kulikov
a736490a36
Merge pull request #3269 from vvlladd28/bug/bulk-import 
[3.0] Correction bulk provision without telemetry
 2020-08-10 14:36:56 +03:00
Igor Kulikov
2bce12fa70
Merge pull request #3268 from vvlladd28/improvement/map/bounds-marker-cluster 
[3.0] Fix updated bounds for marker cluster mode
 2020-08-10 14:36:27 +03:00
Igor Kulikov
389988fbcf
Merge pull request #3267 from vvlladd28/improvmnet/map/empty-data 
[3.0] Fixed loading of data used by post-processing function in key setting
 2020-08-10 14:35:20 +03:00
Igor Kulikov
52d23ac224 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-08-10 14:34:21 +03:00
Igor Kulikov
c1b53afd8a Add entity description to datasource. Fix map markers color. 2020-08-10 14:34:05 +03:00
Andrii Shvaika
cc5b2cc4a6 Log SQL Queries based on execution time threshold 2020-08-10 13:57:12 +03:00
Andrii Shvaika
d542b24ad4 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-08-10 12:53:47 +03:00
Andrii Shvaika
5cc7bbe635 Added ADDITIONAL INFO 2020-08-10 12:53:33 +03:00
Vladyslav_Prykhodko
85a1448b43 Correction bulk provision without telemetry 2020-08-10 12:27:28 +03:00
Vladyslav_Prykhodko
cffe2135f2 Fix updated bounds for marker cluster mode 2020-08-10 10:29:55 +03:00
Vladyslav Prykhodko
ec7ea7042a Fixed loading of data used by post-processing function in key settings for map widgets 2020-08-10 00:15:09 +03:00
Igor Kulikov
9b92f67b34
Merge pull request #3261 from vvlladd28/improvement/map/create-label-tooltip 
[3.0] Optimize created marker label and tooltip
 2020-08-07 19:46:01 +03:00
Vladyslav_Prykhodko
c4ae27795a Add use createdLabelForDatasource 2020-08-07 19:44:30 +03:00
Vladyslav_Prykhodko
13c21cca65 Optimize created marker label and tooltip 2020-08-07 19:41:04 +03:00
Igor Kulikov
6a4cd0d54a Add map widget loading indicator 2020-08-07 18:26:06 +03:00
Igor Kulikov
b2cb7c141c Fix ui compilation 2020-08-07 14:41:49 +03:00
Igor Kulikov
02b6cf6de7 Fix alarm data subscription. Maps cluster mode optimizations. 2020-08-07 14:39:46 +03:00
Igor Kulikov
8750b26f1d Merge branch 'master' of github.com:thingsboard/thingsboard 2020-08-07 10:39:02 +03:00
Igor Kulikov
c0f95aa520 Improve entities and alarms table, preserve columns width while loading data 2020-08-07 10:38:51 +03:00
Igor Kulikov
cc27993b00
Merge pull request #3255 from vvlladd28/feature/sanitier 
[3.0] Add angular Sanitizer for widgetContext
 2020-08-06 19:31:00 +03:00
Vladyslav_Prykhodko
b9125827a1 Add completion 2020-08-06 19:19:53 +03:00
Vladyslav_Prykhodko
9ef632d728 Add angular Sanitizer for widgetContext 2020-08-06 19:05:46 +03:00
Andrii Shvaika
21fa66c61f Merge branch 'master' of github.com:thingsboard/thingsboard 2020-08-06 15:55:44 +03:00
Andrii Shvaika
2bf910ced1 EntityViewSearchQuery improvement 2020-08-06 15:55:32 +03:00
Igor Kulikov
99f538054a
Merge pull request #3253 from vvlladd28/feature/state/pushAndOpenState 
[3.0] Add new method for state controller pushAndOpenState
 2020-08-06 15:07:34 +03:00
vzikratyi
c0ef747c00 Made RestApiCallNode extendable (for custom rule-nodes) 2020-08-06 14:54:03 +03:00
Vladyslav_Prykhodko
634890dce0 Add new method for state controller pushAndOpenState 2020-08-06 14:14:03 +03:00
Andrii Shvaika
2303724585 Performance improvement for queries with no results 2020-08-06 12:58:22 +03:00
Andrii Shvaika
dd31ac55fd Performance improvement for queries with no results 2020-08-06 12:58:00 +03:00
Andrii Shvaika
141b29ad5d Merge branch 'master' of github.com:thingsboard/thingsboard 2020-08-06 12:02:41 +03:00
Andrii Shvaika
70aacd341e Device/AssetRelationQuery fix for 'To'relation type 2020-08-06 12:02:24 +03:00
Igor Kulikov
c0af945133
Merge pull request #3246 from vvlladd28/bug/create-edit-alias-filter-name 
[3.0] Added trim for creating/editing alias or filter name
 2020-08-05 17:52:32 +03:00