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

3144 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
VoBa
7e66fd2693
Fix for pem key with password (#2752) 
* Added activate user config. Fixed https issue

* Added possibility to encode PEM files encrypted with a private key - Integration

* Remove PE fixes
 2020-05-08 16:11:59 +03:00
Yevhen Bondarenko
424d631a69
added extra properties to kafka consumer (#2751) 
* added extra properties to kafka consumer

* added default values for kafka consumer properties in TbKafkaSettings

* Update TbKafkaSettings.java

* Update thingsboard.yml

Co-authored-by: Andrew Shvayka <ashvayka@thingsboard.io>
 2020-05-08 14:38:04 +03:00
Igor Kulikov
f2757e0535 Use source ip load balancing algorithm for http requests 2020-05-07 14:21:17 +03:00
Vladyslav
15452dfe15
Fix error update websocket to change user (#2743) 2020-05-07 11:19:27 +03:00
Andrii Shvaika
864a98fd8b Merge branch 'master' of github.com:thingsboard/thingsboard 2020-05-07 10:49:57 +03:00
Andrii Shvaika
71f94358c4 Fix typos and added break statement 2020-05-07 10:49:44 +03:00
Igor Kulikov
d9bfd82926 Introduce OAuth failure handling 2020-05-06 20:04:09 +03:00
VoBa
9b18c408b2
Added activate user config. Fixed https issue (#2737) 
* Added activate user config. Fixed https issue

* Update OAuth2User.java

Co-authored-by: Igor Kulikov <ikulikov82@gmail.com>
 2020-05-06 19:20:18 +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
c83d600bdd Merge branch 'master' of github.com:thingsboard/thingsboard 2020-05-06 12:29:41 +03:00
Igor Kulikov
175a9c903d OAuth: activate user with empty password - to be able to set up it later 2020-05-06 12:29:26 +03:00
Andrew Shvayka
b49a7f573b
Merge pull request #2736 from volodymyr-babak/bug/relation-concurrent-fix 
Changed direct executors to db executors
 2020-05-06 12:21:02 +03:00
Volodymyr Babak
d67ab52309 Changed direct executors to db executors 2020-05-06 12:17:41 +03:00
Andrew Shvayka
1c82df42e2
Merge pull request #2735 from volodymyr-babak/bug/relation-concurrent-fix 
Bug/relation concurrent fix
 2020-05-06 12:08:42 +03:00
Volodymyr Babak
7a633ed60a Fixed issue with cretion/delete of relation because of concurrent access to class variable 2020-05-06 11:10:54 +03:00
Volodymyr Babak
03bcbf2304 Merge remote-tracking branch 'upstream/master' 2020-05-06 11:08:44 +03:00
Igor Kulikov
92c9bc0ae5 Improve oauth mapper - create default rule chains for tenant 2020-05-06 09:58:52 +03:00
VoBa
549ab8addf
Exclude old spring-core version (#2733) 
* Renamed env variabled. Added sync

* Exclude old spring-core version
 2020-05-05 19:24:35 +03:00
Volodymyr Babak
1c2361fedd Exclude old spring-core version 2020-05-05 19:16:02 +03:00
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
Vladyslav
69ca93e458
Updated URL for package markerClusterGoogle (#2732) 2020-05-05 18:07:18 +03:00
Volodymyr Babak
4240ac10f2 Merge remote-tracking branch 'upstream/master' 2020-05-05 17:04:41 +03:00
Igor Kulikov
294b0e9e68 Fix entity admin wudgets aliases 2020-05-05 16:49:40 +03:00
Andrii Shvaika
f07d7441b2 Change of the partition routing strategy 2020-05-05 16:11:10 +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
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
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
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
Volodymyr Babak
7b4ebc75ff Renamed env variabled. Added sync 2020-05-04 11:41:37 +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
YevhenBondarenko
00e32ee8a3 merge with feature/queue-consumers-refactoring 2020-05-04 09:39:04 +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
dab185208a Test fixed 2020-05-04 00:21:58 +03:00
Volodymyr Babak
4df25672b1 Revert debug logger 2020-05-04 00:21:58 +03:00
Volodymyr Babak
8dbc550fd3 Refactoring to review. Added tenantId and customerId. Added email tenant name strategy 2020-05-04 00:21:58 +03:00
Volodymyr Babak
d644dddcc9 Removed comment line 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