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

2125 Commits

Author SHA1 Message Date
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
Igor Kulikov
534db078ff Dashboard page fixes and improvements 2020-04-29 11:33:42 +03:00
Igor Kulikov
413ad261e2 Fix conflicts 2020-04-28 20:02:33 +03:00
Artem Halushko
8bc06df8d4 input bundles updates 2020-04-28 19:56:16 +03:00
Artem Halushko
73b03394f0 tile layers and locations set fixes 2020-04-28 19:27:38 +03:00
Igor Kulikov
37c8cd157d UI: Migrate gateway widgets and gateways demo dashboard to 3.0 2020-04-28 18:47:20 +03:00
Artem Halushko
1e0e1bd542 fix some ds problems 2020-04-28 18:20:48 +03:00
Artem Halushko
0ef4a40375 entity save fix#3 2020-04-28 15:21:36 +03:00
Artem Halushko
9479b4194f entity save fix #2 2020-04-28 15:18:40 +03:00
Igor Kulikov
6a47f022ac Add new widgetContext field currentUser 2020-04-28 14:58:21 +03:00
Igor Kulikov
a39fe0f313 Minor fixes 2020-04-28 14:44:48 +03:00
Artem Halushko
c627e79947 small css fix 2020-04-28 13:48:55 +03:00
Artem Halushko
d56a3abaca saveEntity && minor fixes 2020-04-28 13:31:47 +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
Vladyslav
a36de5d62c
Add gateway type and clear import (#2677) 2020-04-28 12:04:21 +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