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

4006 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
VoBa
8d0607d54c
Added/improved comments for OAuth 2 configuration (#2731) 
* Renamed env variabled. Added sync

* Added/improved comments for OAuth 2 configuration
 2020-05-05 18:18:01 +03:00
Igor Kulikov
662e05e9a0 Fix oauth2 login button 2020-05-05 18:16:24 +03:00
Vladyslav
69ca93e458
Updated URL for package markerClusterGoogle (#2732) 2020-05-05 18:07:18 +03:00
Igor Kulikov
8ebc019041 Fix entity state controller name resolution 2020-05-05 18:02:34 +03:00
Volodymyr Babak
4240ac10f2 Merge remote-tracking branch 'upstream/master' 2020-05-05 17:04:41 +03:00
Igor Kulikov
45852c9bba Merge branch 'master' into develop/3.0 2020-05-05 16:49:57 +03:00
Igor Kulikov
294b0e9e68 Fix entity admin wudgets aliases 2020-05-05 16:49:40 +03:00
Igor Kulikov
2a7e220fc3 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-05-05 16:47:29 +03:00
Andrii Shvaika
f07d7441b2 Change of the partition routing strategy 2020-05-05 16:11:10 +03:00
Igor Kulikov
3ab8f42016 Cassandra to SQL boolean column fix 2020-05-05 15:12:30 +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
Vladyslav
adc982923d
[3.0] Improvment image map (#2729) 
* Add support setting position function

* Improved setting image map

* Add support setting offset marker
 2020-05-05 13:47:37 +03:00
Igor Kulikov
f7efb79015 Minor fixes 2020-05-05 13:46:26 +03:00
Adsumus
746e63ab63 Merge branch 'develop/3.0' of https://github.com/thingsboard/thingsboard into map/3.0 2020-05-05 12:56:39 +03:00
Adsumus
22210e6833 Merge branch 'map/3.0' of https://github.com/ArtemHalushko/thingsboard into map/3.0 2020-05-05 12:52:46 +03:00
Igor Kulikov
9953853f71 Refactoring 2020-05-05 12:19:21 +03:00
Igor Kulikov
98a15cd098 Merge branch 'ArtemHalushko-map/3.0' into develop/3.0 2020-05-05 11:57:50 +03:00
Igor Kulikov
503bca902a Minor refactoring 2020-05-05 11:57:35 +03:00
Igor Kulikov
6440f9acfe Merge branch 'map/3.0' of https://github.com/ArtemHalushko/thingsboard into ArtemHalushko-map/3.0 2020-05-05 09:35:49 +03:00
Igor Kulikov
66db4c7fef Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-05-05 09:34:38 +03:00
YevhenBondarenko
b8de64f3fb fix problem with duplication mail dependencies 2020-05-05 00:18:20 +03:00
YevhenBondarenko
3e92a6a8d8 fix spring versions conflict 2020-05-04 21:55:36 +03:00
YevhenBondarenko
f1e651bb7d improvements 2020-05-04 21:55:36 +03:00
YevhenBondarenko
9f773fb37f updated spring and netty versions, excluded log4j from zookeeper dependency 2020-05-04 21:55:36 +03:00
Andrew Shvayka
a6648163bb Revert "updated spring and netty versions, excluded log4j from zookeeper dependency" 
This reverts commit 73805759f6866c505586f813e5d860fe1f5b4bc9.
 2020-05-04 18:54:38 +03:00
Andrew Shvayka
a167ee2e32 Revert "improvements" 
This reverts commit 9d8a7f04265b4e4944b7668a5a1b443d75c5282c.
 2020-05-04 18:54:38 +03:00
Artem Halushko
cd88afea00 fix empty center position & fix entity id 2020-05-04 18:04:35 +03:00
Andrii Shvaika
b592e88643 Default Statistics interval is 1 min 2020-05-04 17:40:35 +03:00
YevhenBondarenko
9d8a7f0426 improvements 2020-05-04 17:35:08 +03:00
YevhenBondarenko
73805759f6 updated spring and netty versions, excluded log4j from zookeeper dependency 2020-05-04 17:35:08 +03:00
Igor Kulikov
b34122a30c Fix docker hybrid db mode 2020-05-04 17:34:09 +03:00
Artem Halushko
7245f88014 remove image map zoom 2020-05-04 16:44:14 +03:00
Igor Kulikov
3a129de654 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-05-04 15:01:47 +03:00
Andrii Shvaika
830d02ef6a Fix for HTTP and CoAP device activity 2020-05-04 14:00:18 +03:00
Andrii Shvaika
2e148f6b7d Merge branch 'master' of github.com:thingsboard/thingsboard 2020-05-04 13:22:50 +03:00
Andrii Shvaika
962755735b Fix for Server-side RPC in cluster mode 2020-05-04 13:22:36 +03:00
Igor Kulikov
4d03c51743 Merge with master 2020-05-04 12:23:13 +03:00
Hamza Slama
6037f0f47a Rename Typo 2020-05-04 12:10:12 +03:00
Volodymyr Babak
fc46175e99 Renamed env variabled. Added sync 2020-05-04 12:09:21 +03:00
Igor Kulikov
a4a4badb8d Fix Manage dashboard customers 2020-05-04 12:01:53 +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
Volodymyr Babak
7b4ebc75ff Renamed env variabled. Added sync 2020-05-04 11:41:37 +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
3ed29a8467 Merge branch 'develop/3.0' of https://github.com/thingsboard/thingsboard into map/3.0 2020-05-04 10:29:05 +03:00
Andrew Shvayka
c1b5fd5c57
Merge pull request #2714 from thingsboard/feature/queue-consumers-refactoring 
Feature/queue consumers refactoring
 2020-05-04 10:17:46 +03:00
Andrew Shvayka
ce01e32949
Merge pull request #2716 from YevhenBondarenko/develop/2.5-js-executor 
[2.5] js executor
 2020-05-04 10:17:08 +03:00