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

135 Commits

Author SHA1 Message Date
deaflynx
95babbe246 Edge Dashboard and RuleChain partially fixed. Not working: get edge dashboards; default edges; assing edge rule chains to edge 2020-06-24 11:16:46 +03:00
deaflynx
bc28406594 Partial fix Edge Rule Chain page 2020-06-23 00:34:47 +03:00
deaflynx
f035bbd941 Partial fix Edge dashboards page 2020-06-22 15:52:01 +03:00
deaflynx
c242446a86 Fixed Edge entity view page 2020-06-22 12:37:36 +03:00
deaflynx
3a48b90d84 Fixed Edge devices page 2020-06-22 12:08:31 +03:00
deaflynx
5a07a7aca4 Merged UI-NGX with develop/3.0-edge-fixed 2020-06-21 20:38:43 +03:00
Igor Kulikov
b86c5e61e1 Image map fixes and improvements. Fixed state chart subscription. 2020-06-09 12:19:50 +03:00
Igor Kulikov
dc3c65dca2 Improve rpc error handling 2020-06-08 10:29:42 +03:00
Igor Kulikov
fe36f91890 Alias: Batch support for fetching entities from relations 2020-05-29 15:06:03 +03:00
Vladyslav_Prykhodko
11207c7550 Fix get enity relation infoes for empty array 2020-05-27 20:25:12 +03:00
Vladyslav_Prykhodko
8f880da13d Fix load Google Map 2020-05-25 22:00:41 +03:00
Vladyslav_Prykhodko
55a949b6d9 Fix setting 'Margin beetween widgets' set 0 2020-05-25 17:22:17 +03:00
Vladyslav_Prykhodko
1b9cf7c527 Fix tooltip data 2020-05-12 17:24:36 +03:00
Vladyslav
7a87e6c16d
Fix error update websocket to change user (#2744) 2020-05-07 11:27:29 +03:00
Igor Kulikov
e9553b627b Introduce OAuth failure handling 2020-05-06 20:30:02 +03:00
Igor Kulikov
d1ca706b48 Fix Auth guard 2020-05-05 14:29:38 +03:00
Igor Kulikov
b07732a681 Minor fixes 2020-05-05 13:53:20 +03:00
Igor Kulikov
9953853f71 Refactoring 2020-05-05 12:19:21 +03:00
Igor Kulikov
503bca902a Minor refactoring 2020-05-05 11:57:35 +03:00
Artem Halushko
7593b1b46b Merge branch 'develop/3.0' of https://github.com/thingsboard/thingsboard into map/3.0 2020-05-04 11:54:52 +03:00
Artem Halushko
19b0da39ca provide entity to custom actions 2020-05-04 11:51:20 +03:00
VoBa
c0dfa4861b
[WIP] [3.0] Added OAuth2 Support (#2709) 
* Added base impl for OAuth-2

* Added basic and custom OAuth2 user mappers

* Removed comment line

* Refactoring to review. Added tenantId and customerId. Added email tenant name strategy

* Revert debug logger

* Fixed compilation

* Test fixed

* Create UI for OAuthService

* Revert package-lock.json

* Add translate login es_ES

Co-authored-by: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
 2020-05-04 11:51:08 +03:00
Vladyslav
7013377d8c
[3.0] Improvement map (#2706) 
* Fix load custom marker image for Firefox

* Fix update polygon color
 2020-05-04 11:41:34 +03:00
ArtemHalushko
11db772ea2
bugfixes (#2705) 2020-05-04 11:40:54 +03:00
Artem Halushko
8b77a5c359 Merge branch 'develop/3.0' of https://github.com/thingsboard/thingsboard into map/3.0 2020-04-30 18:53:44 +03:00
Artem Halushko
9a993d286e bugfixes 2020-04-30 18:52:57 +03:00
Igor Kulikov
3d2270e11e Minor improvements 2020-04-30 15:46:45 +03:00
VoBa
11d4ef74e8
[3.0] Improved login by params to support nagivation to different dashboards (#2703) 
* Improved login by params to support nagivation to different dashboards

* Refactorting
 2020-04-30 15:42:19 +03:00
Artem Halushko
73b03394f0 tile layers and locations set fixes 2020-04-28 19:27:38 +03:00
Artem Halushko
1e0e1bd542 fix some ds problems 2020-04-28 18:20:48 +03:00
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
0ce514b58c wip on image-map fixes 2020-04-27 19:20:23 +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
Vladyslav
e3e860fe3f
[3.0] Improvement code style (#2670) 
* Clear code and styles

* Clear import
 2020-04-27 09:27:14 +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
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
28d48933f2 UI: Minor fixes 2020-04-23 12:01:58 +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
cfc8e67cab Add utils to public-api 2020-04-17 18:50:55 +03:00
Igor Kulikov
b30370328f Minor fixes 2020-04-10 15:10:56 +03:00