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

4405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Kulikov
9ad019c478 Fix compile error 2020-08-12 16:27:38 +03:00
Igor Kulikov
da22b69cc5 Merge branch 'develop/2.5.3' 2020-08-12 15:59:15 +03:00
Igor Kulikov
6d2406be53 Update rulenode config ui 2020-08-12 15:54:30 +03:00
Igor Kulikov
e364b865d6
Merge pull request #3292 from YevhenBondarenko/master 
fix ts latest migration
 2020-08-12 15:01:57 +03:00
YevhenBondarenko
4d4e4940d2 added schema ts latest for migration 2020-08-12 14:59:46 +03:00
Igor Kulikov
bf920c0b2d
Merge pull request #3293 from vvlladd28/bugs/delete-update/marker-polygon 
Updated example delete marker/polygon for map
 2020-08-12 14:04:02 +03:00
Vladyslav_Prykhodko
cb64c860ec Update tootlip create marker/polygon 2020-08-12 13:48:11 +03:00
zbeacon
c6f037073b MQTT Gateway API tests 2020-08-12 13:38:48 +03:00
YevhenBondarenko
70c3494c01 fix ts latest migration 2020-08-12 13:31:27 +03:00
Igor Kulikov
2b82223c8f Merge branch 'develop/2.5.3' 2020-08-12 13:23:51 +03:00
Igor Kulikov
f4efea9a0b Improve connect event transformation 2020-08-12 13:23:22 +03:00
Vladyslav_Prykhodko
968f2745a0 Updated example delete marker/polygon for map 2020-08-12 13:07:09 +03:00
Igor Kulikov
6b90c7ce21 Improve connect event transformation 2020-08-12 11:15:28 +03:00
Igor Kulikov
8c9aca9133 Merge branch 'develop/2.5.3' 2020-08-12 09:59:11 +03:00
Igor Kulikov
abd67d2536 Merge branch 'develop/2.5.3' of github.com:thingsboard/thingsboard into develop/2.5.3 2020-08-12 09:58:59 +03:00
Igor Kulikov
b24ea7803b
Merge pull request #3284 from ShvaykaD/fix/connectEventReporting 
Removed active field on Connect event reporting
 2020-08-12 09:58:25 +03:00
Igor Kulikov
338b7492c9
Merge pull request #3283 from vzikratyi-tb/feature/ack-time-metrics 
Track time to acknowledge messages (in actuator/prometheus)
 2020-08-12 09:58:14 +03:00
Igor Kulikov
30b0897e87 Fix for TbMsg serialization error: '...TbMsgCallback cannot be serialized...' 2020-08-12 09:56:29 +03:00
Igor Kulikov
504158f9a0 Merge branch 'develop/2.5.3' 2020-08-11 20:04:33 +03:00
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
Dmytro Shvaika
197db609ca removed active field on Connect event reporting 2020-08-11 19:22:31 +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
vzikratyi
b957a0ce8b Log time to acknowledge message 2020-08-11 17:25:16 +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