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

970 Commits

Author SHA1 Message Date
Igor Kulikov
e3e037c93e Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-05-07 12:46:43 +03:00
Vladyslav
15452dfe15
Fix error update websocket to change user (#2743) 2020-05-07 11:19:27 +03:00
Igor Kulikov
0ce5222072 Merge branch 'master' into develop/3.0 2020-05-06 20:04:33 +03:00
Igor Kulikov
d9bfd82926 Introduce OAuth failure handling 2020-05-06 20:04:09 +03:00
Igor Kulikov
f29c9c9452 Improve OAuth button style 2020-05-06 16:22:18 +03:00
Igor Kulikov
ab27084e7e Improve OAuth button style 2020-05-06 15:43:08 +03:00
Igor Kulikov
9a14dd385d Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-05-05 18:19:43 +03:00
Vladyslav
69ca93e458
Updated URL for package markerClusterGoogle (#2732) 2020-05-05 18:07:18 +03:00
Igor Kulikov
4d03c51743 Merge with master 2020-05-04 12:23:13 +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_Prykhodko
8b9bb6ebb2 Add translate login 2020-05-04 00:21:58 +03:00
Vladyslav
e66afcd26c Fix translate 2020-05-04 00:21:58 +03:00
Volodymyr Babak
a563fdab3f Added basic and custom OAuth2 user mappers 2020-05-04 00:21:58 +03:00
Volodymyr Babak
7fc46010b7 Added base impl for OAuth-2 2020-05-04 00:21:58 +03:00
Igor Kulikov
2f8c7bb6b0 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-04-30 15:48:21 +03:00
VoBa
e39ccaa2cc
[2.5] Improved login by params to support nagivation to different dashboards (#2702) 
* Improved login by params

* Fix

* Removed incorrect redirect

* Refactoring
 2020-04-30 15:48:07 +03:00
Igor Kulikov
a05774046a Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-04-30 09:51:14 +03:00
Vladyslav
b8a305ec57
Fix position autocomplete (#2699) 2020-04-30 09:50:50 +03:00
Igor Kulikov
22a18b016b Merge with master 2020-04-29 15:02:47 +03:00
Igor Kulikov
6b6d4702a8 Update package.json versions 2020-04-29 14:30:34 +03:00
Andrii Shvaika
91aa7a2700 Merge with master (2.5) 2020-04-27 00:40:21 +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
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
Andrii Shvaika
d965df8c27 Merge remote-tracking branch 'origin/master' into develop/2.5 2020-04-21 21:20:48 +03:00
Igor Kulikov
8f2bf864c2 Merge with master 2020-04-21 10:09:38 +03:00
Ilya Barkov
149ec2804b
Feature/gateway remote configuration (#2627) 
* new widget for gateway with the last telemetry type

* add isStateForm for the last telemetry type

* add config update save

* update thingboard yaml

* remove update thingboard yaml

* add new widget to gateway_widgets.json

* delete state gateway

* delete state gateway

* Revert "delete state gateway"

This reverts commit d8024ead

* change yml

* edit name isReadOnly

* fix bug  isReadOnly

* [Gateway remote configuration] Changed default logs.conf file

Co-authored-by: nick <nick.@avalr.com.ua>
 2020-04-20 16:20:33 +03:00
ShvaykaD
0a136588eb
CheckPoint Node ui, Queue Controller, queue-type-list directive (#2612) 
* init commit

* ui: service for queue

* merge with develop/2.5 & fix license

* queue directive

* queue directive

* queue-type-list directive & TbCheckPointNode

* added rulenode-core-config.js file

* added new rulenode-core-config.js

* Develop/2.5 check point node (#3)

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* Develop/2.5 check point node (#4)

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

Co-authored-by: Dmitriymush <powder322@gmail.com>
Co-authored-by: Dmitriy Mushat <54553744+Dmitriymush@users.noreply.github.com>
 2020-04-15 17:48:47 +03:00
Andrii Shvaika
7c24b850fb Merge remote-tracking branch 'origin/master' into develop/2.5 2020-04-14 16:17:27 +03:00
Igor Kulikov
c9e3a62f6e Merge with master 2020-04-14 11:47:14 +03:00
Vladyslav
2a2a0f9caf
Added new settings to web-camera input widget (#2616) 2020-04-14 11:42:37 +03:00
YevhenBondarenko
e83d69c40c isolated tenant improvements 2020-04-14 00:02:59 +03:00
Yevhen Bondarenko
7869fb5ef4
added to tenant fields isolatedTbCore and isolatedTbRuleEngine (#2611) 
Co-authored-by: Andrew Shvayka <ashvayka@thingsboard.io>
 2020-04-13 10:24:40 +03:00
Igor Kulikov
1b0fabb7ab Merge branch 'master' into develop/3.0 2020-04-10 15:07:44 +03:00
ShvaykaD
a3a17dc828
add sendActivationEmail as request param (default -> true) to activate method in auth controller and login service (#2597) 2020-04-10 15:06:44 +03:00
Vladyslav
2a1c55f022
[2.5] Revert change JSON form (#2598) 
* Revert change

* Revert file
 2020-04-10 15:04:55 +03:00
Vladyslav
39ba550d41
Fix not add entityLabel for header action open dashboard state (#2601) 2020-04-10 15:04:45 +03:00
Vladyslav
e8fffdbc4d
Fix manage dashboard states for Safari (#2602) 2020-04-10 15:04:34 +03:00
Vladyslav
3881dc8423
Add new alias Current tenant (#2596) 2020-04-10 15:04:24 +03:00
VoBa
fcf436c620
[2.5] Added possibility to login by url params (#2581) 
* Added possibility to login by url params

* Changes after code review
 2020-04-09 18:40:34 +03:00
Andrii Shvaika
2f6c6ad1fe Merge with master 2020-04-08 18:24:52 +03:00
Igor Kulikov
7e8c90ec6d Merge branch 'master' into develop/3.0 2020-04-01 09:48:16 +03:00
Vladyslav
fef74373e0
Fix timeseries table layout (#2569) 2020-04-01 09:42:03 +03:00
Vladyslav_Prykhodko
903e459851 The map was not loaded with empty entity(not set longitude/latitude) 2020-03-28 02:27:18 +02:00
Igor Kulikov
1077def2f5 Merge branch 'master' into develop/3.0 2020-03-26 14:51:36 +02:00
Vladyslav
5cf35dae94
Add delete translate and change setting name (#2546) 2020-03-26 14:47:24 +02:00
Igor Kulikov
42ef20114d Merge branch 'master' into develop/3.0 2020-03-24 15:55:37 +02:00
Chantsova Ekaterina
cb2278ed56
Remove empty strings from Spanish translations (#2539) 2020-03-24 15:53:18 +02:00
Chantsova Ekaterina
b780b16c28
Remove empty strings from Spanish translations (#2541) 2020-03-24 15:52:08 +02:00
Oleg Kolesnik
08c8d93568
UI:fix. Map widget2 (#2413) 
preserves previous data on map if no data for current date range received
 2020-03-24 15:50:52 +02:00
ArtemHalushko
42c52bfdba
Map/3.0 (#2535) 
* 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

Co-authored-by: Artem Halushko <ahalushko@thingboards.io>
Co-authored-by: Adsumus <artemtv42@gmail.com>
 2020-03-20 16:57:35 +02:00