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

4334 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Kulikov
50daac16fa Merge with master 2020-08-11 20:04:17 +03:00
Igor Kulikov
c4c65bbaeb Entity Data Query -> use emptu string instead of null for latest values 2020-08-11 19:59:28 +03:00
Igor Kulikov
d646ff5b41 Fix web camera input widget 2020-08-11 19:49:30 +03:00
Igor Kulikov
2bc2624a60
Merge pull request #3286 from vvlladd28/bugs/map/edit-polygon 
Fix createed and updated polygon
 2020-08-11 19:44:32 +03:00
Igor Kulikov
5a41def986
Merge pull request #3285 from vvlladd28/improvement/web-camera-widget 
Fix updated data from web camera input widget
 2020-08-11 19:44:15 +03:00
Vladyslav_Prykhodko
3e2600cbbc Fix createed and updated polygon 2020-08-11 19:42:28 +03:00
Vladyslav_Prykhodko
fb3fa52ae8 Fix updated data from web camera input widget 2020-08-11 19:20:14 +03:00
Igor Kulikov
1844058d1d Fix boolean input widgets 2020-08-11 18:50:08 +03:00
Igor Kulikov
2a8379c3eb
Merge pull request #3282 from vvlladd28/improvment/map/name-value 
Fix parameter name map
 2020-08-11 17:49:04 +03:00
Vladyslav_Prykhodko
ac2564c75e Fix parameter name map 2020-08-11 17:46:53 +03:00
Igor Kulikov
5833ac3521
Merge pull request #3281 from vvlladd28/improvement/sort-meta-key 
Add sort metadata key for rule chain
 2020-08-11 17:45:07 +03:00
Igor Kulikov
2202ef7814
Merge pull request #3277 from mp-loki/feature/sorted-metadata-keys 
Display sorted metadata keys in rule nodes
 2020-08-11 17:44:56 +03:00
Vladyslav_Prykhodko
ce649822e2 Add sort metadata key 2020-08-11 17:43:19 +03:00
Igor Kulikov
a1f2ef40e5
Merge pull request #3280 from MrKartoshka/editable-polygons 
Editable polygons
 2020-08-11 17:25:12 +03:00
Vladyslav_Prykhodko
a1fb61ff4c Clear code 2020-08-11 16:58:26 +03:00
Mrkartoshka
a088221c25 update default custom actions 2020-08-11 16:33:38 +03:00
Mrkartoshka
ac6e946b2b moved from Array<> to LatLngTuple[] types 2020-08-11 16:23:41 +03:00
Mrkartoshka
5db2c85f4c widget bundle with origin order 2020-08-11 16:13:39 +03:00
Igor Kulikov
7ef75524d0 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-08-11 14:35:48 +03:00
Igor Kulikov
80bc235975 Improve entities and alarms table widget title processing. 2020-08-11 14:35:36 +03:00
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