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

255 Commits

Author SHA1 Message Date
Artem Halushko
77ec391185 merge fixes 2020-04-28 12:13:05 +03:00
Artem Halushko
dd98d761df Merge branch 'develop/3.0' of https://github.com/thingsboard/thingsboard into map/3.0 2020-04-28 12:07:46 +03:00
Artem Halushko
2bd1a796e0 image map alias image support 2020-04-28 11:57:09 +03:00
Artem Halushko
0ce514b58c wip on image-map fixes 2020-04-27 19:20:23 +03:00
Igor Kulikov
2fc25ad33d Remove redudant css import 2020-04-27 18:37:26 +03:00
Artem Halushko
4f8942b112 update map bundles 2020-04-27 16:10:46 +03:00
Artem Halushko
26e5f69b32 map fixes 2020-04-27 14:46:43 +03:00
Igor Kulikov
0289b0c1a2 UI: Get rid of 'multiple directives with 'exportAs' set to ngForm' 2020-04-27 10:39:18 +03:00
Igor Kulikov
77c6babff6 Fix tenant isolated checkbox fields 2020-04-27 09:43:33 +03:00
Vladyslav
e3e860fe3f
[3.0] Improvement code style (#2670) 
* Clear code and styles

* Clear import
 2020-04-27 09:27:14 +03:00
Vladyslav
e175b57110
[3.0] Entity list not correct find index for model (#2668) 
* Entity list not correct find index for model

* Clear import

* Revert change

* Revert change
 2020-04-27 09:26:17 +03:00
Andrii Shvaika
df3614f9e4 Fix Alarm repository. Add queue type list select. 2020-04-27 01:12:23 +03:00
Adsumus
852d4ec954 WIP on es support 2020-04-26 22:50:26 +03:00
Adsumus
3fe468b276 wip on ie 11 fixes 2020-04-26 19:44:59 +03:00
Andrew Shvayka
38ebbe2576 Revert "Merge with master. AlarmRepository.findAlarms is failing (#2663)" 
This reverts commit 2c02406ee5f41b08e655b634dd9871403f67149d.
 2020-04-24 19:42:32 +03:00
Igor Kulikov
99ef1cba28 IE11 fixes 2020-04-24 18:36:46 +03:00
Igor Kulikov
916579cf05 Fix bundles budget 2020-04-24 17:21:29 +03:00
Adsumus
9e866b68e8 public api import fix 2020-04-24 17:14:30 +03:00
Igor Kulikov
19601e40ed Update rule node core config. 2020-04-24 16:26:58 +03:00
Vladyslav
9c5ad303cd
Add support Safari and improvement view (#2662) 2020-04-24 15:49:53 +03:00
ArtemHalushko
241edc1d2b
Map/3.0 (#2664) 
* add base map infrastructure

* add leaflet css

* add tencent map

* add google maps support

* added image map support

* refactor schemes

* here maps support && WIP on markers

* add simple marker suppor

* data update & polyline support

* map bouds support

* add some settings support

* add map provider select to settings

* labels support

* WIP on trip animation widget

* WIP on history control and route interpolation

* trip-animation map provider & custom markers

* comleted track marker & history controls

* add license headers

* label fix & tooltips support

* WIP on polygons

* marker dropping support

* add polygon support

* add label to trip animation

* WIP on tooltips

* lint anf typed leaflet AddMarker

* some typing and poly improvements

* add typing

* add marker creation

* update proxy

* save position fix

* add bounds padding

* update map widget bendle && bugfixes

* update marker placement widget

* add licenses

* reomove log

* fix sizes

* entity and map fixes

* Fix tile server support  form OSM and zoom level fix

* add support custom actions

* map fixes

Co-authored-by: Artem Halushko <ahalushko@thingboards.io>
Co-authored-by: Adsumus <artemtv42@gmail.com>
 2020-04-24 15:48:00 +03:00
Andrew Shvayka
2c02406ee5
Merge with master. AlarmRepository.findAlarms is failing (#2663) 
* Merge with master. AlarmRepository.findAlarms is failing

* Fix Alarm repository. Add queue type list select.

Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io>
 2020-04-24 15:44:31 +03:00
Adsumus
f9574d7041 Merge branch 'develop/3.0' of https://github.com/thingsboard/thingsboard into map/3.0 2020-04-24 11:22:45 +03:00
Adsumus
8979a511a3 map fixes 2020-04-24 11:22:26 +03:00
Igor Kulikov
4f92af63d5 Fix: reset entity table sort and pagination on entities specific filtering changes 2020-04-23 13:40:02 +03:00
Igor Kulikov
00e7779f71 Minor UI fixes 2020-04-23 13:27:21 +03:00
Igor Kulikov
28d48933f2 UI: Minor fixes 2020-04-23 12:01:58 +03:00
Igor Kulikov
392edbae1a Fix typo 2020-04-22 14:46:47 +03:00
Vladyslav
b459d75fb6
Improvement resize (#2654) 2020-04-22 14:35:27 +03:00
Igor Kulikov
c654f1ad5c Update package.lock 2020-04-22 13:36:01 +03:00
Igor Kulikov
48aab55228 Remove javascript-detect-element-resize 2020-04-22 13:29:30 +03:00
Vladyslav
caf91be338
Change resize events to observer (#2652) 2020-04-22 13:21:14 +03:00
Adsumus
8460358f06 Merge branch 'develop/3.0' of https://github.com/thingsboard/thingsboard into map/3.0 2020-04-21 19:49:03 +03:00
Vladyslav
4ede9a3a4d
Fix toolbar and share buttons (#2646) 2020-04-21 13:28:27 +03:00
Igor Kulikov
256500ee85 Fix issues after angular update 2020-04-21 13:15:01 +03:00
Igor Kulikov
bee843696c Angular update 2020-04-21 12:29:26 +03:00
Igor Kulikov
9dac46f065 Angular update 2020-04-21 12:28:37 +03:00
Vladyslav
3103d0a726
[3.0] minor fix (#2645) 
* Improvement layout-setting setting from mobile/tablet view

* Fix EntityView not show type in translate

* Clear code and update tablet/mobile view

* Update tablet/mobile view

* Fix hide title and text-overflow

* Add support Safari

* Minor fix
 2020-04-21 11:53:26 +03:00
Adsumus
9766267dbe Merge branch 'develop/3.0' of https://github.com/thingsboard/thingsboard into map/3.0 2020-04-21 05:08:52 +03:00
Adsumus
cc5ebfbff7 add support custom actions 2020-04-21 05:08:06 +03:00
Igor Kulikov
46e3b7a11b UI: Rule nodes ui api 2020-04-20 11:42:46 +03:00
Igor Kulikov
c3b71a7fa3 UI: Rule node ui external modules 2020-04-17 19:01:01 +03:00
Igor Kulikov
cfc8e67cab Add utils to public-api 2020-04-17 18:50:55 +03:00
Igor Kulikov
8b206b1760 Rule node models improvements 2020-04-17 17:23:37 +03:00
Igor Kulikov
a487914dcb UI: Entity autocomplete error handling 2020-04-17 15:13:19 +03:00
Igor Kulikov
eb4334937c UI: Entity autocomplete error handling 2020-04-17 15:12:37 +03:00
Igor Kulikov
1e079457c7 UI: Json React Form - textarea height fix 2020-04-16 18:25:10 +03:00
Igor Kulikov
ac963baa62 UI: Entities table improvements 2020-04-15 13:00:32 +03:00
Igor Kulikov
e103d5a88b UI: Entity details panel improvements 2020-04-14 19:22:14 +03:00
Vladyslav
612a8c7dd1
[3.0] Minor fix (#2615) 
* Improvement tenant setting from mobile view

* Improvement timewindow setting from mobile view

* Improvement entity-view setting from mobile view

* Update license header and license config
 2020-04-14 11:38:30 +03:00