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

3202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
deaflynx
0f24bd2912 Edge code cleaning. Not stable Default edges 2020-06-01 14:30:44 +03:00
deaflynx
cc7bd63b62 Fixed edge dashboards breadcrumb 2020-05-30 18:39:14 +03:00
deaflynx
5d385809e7 Default edge rulechain label fixed. Fixed makeDefaultEdgeRuleChain server side 2020-05-30 17:35:51 +03:00
Volodymyr Babak
85a88ee499 Removed assigned edges from dashboard 2020-05-27 14:40:39 +03:00
Volodymyr Babak
6ab3714ac5 Added default rule chain for server side 2020-05-27 09:22:25 +03:00
deaflynx
7ec2b8d310 Edge assignment cleaned all over CE entities, except Edge page. Fixed some locals for Unassign edge 2020-05-25 16:43:43 +03:00
Volodymyr Babak
487bf9999e Added user group name 2020-05-24 19:46:02 +03:00
Volodymyr Babak
eb2ebf58d9 Fixed comp issue 2020-05-23 20:49:13 +03:00
Volodymyr Babak
7ec1e369d5 Added user updated msg 2020-05-23 19:51:03 +03:00
Volodymyr Babak
eceb9f1309 Renamed class 2020-05-22 18:52:44 +03:00
Volodymyr Babak
31a1e310f1 Rule chain refactoring 2020-05-15 19:36:32 +03:00
Volodymyr Babak
1a084a80f8 Added group field 2020-05-13 18:00:45 +03:00
Volodymyr Babak
1bfe950f58 Fixes for downlink msg. Refactoring 2020-05-13 12:31:33 +03:00
Volodymyr Babak
2af6e5d3d6 Fixed push to updates 2020-05-11 12:31:56 +03:00
Volodymyr Babak
12b5a932c3 Fixes after code review 2020-05-10 23:20:30 +03:00
Volodymyr Babak
95ce5595fc Fixes after merge 2020-05-09 03:27:03 +03:00
Volodymyr Babak
c114dd980c Refactoring 2020-05-09 02:15:12 +03:00
Volodymyr Babak
10f8039349 Merge remote-tracking branch 'upstream/master' into feature/edge 2020-05-08 22:39:51 +03:00
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