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

3798 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
b81370b6a0 Merge branch 'master' into develop/3.0 2020-05-07 14:21:35 +03:00
Igor Kulikov
f2757e0535 Use source ip load balancing algorithm for http requests 2020-05-07 14:21:17 +03:00
Igor Kulikov
4659ab7dd0 Improve table widgets mobile mode 2020-05-07 13:07:11 +03:00
Igor Kulikov
e3e037c93e Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-05-07 12:46:43 +03:00
Igor Kulikov
0e45e45f55 Fix typo 2020-05-07 12:42:27 +03:00
ArtemHalushko
416d045893
Map/3.0 (#2738) 
* WIP on trip-animation settings

* trip-animation points & anchors

* fixes

Co-authored-by: Adsumus <artemtv42@gmail.com>
Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io>
 2020-05-07 12:25:43 +03:00
Igor Kulikov
3280df3b9c
Merge branch 'develop/3.0' into map/3.0 2020-05-07 12:25:31 +03:00
Artem Halushko
9e860a3bf8 fixes 2020-05-07 11:37:07 +03:00
Vladyslav
7a87e6c16d
Fix error update websocket to change user (#2744) 2020-05-07 11:27:29 +03:00
Igor Kulikov
9db9c36bb3 Fix tests 2020-05-07 11:23:36 +03:00
Vladyslav
15452dfe15
Fix error update websocket to change user (#2743) 2020-05-07 11:19:27 +03:00
Igor Kulikov
bf258a94a3 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-05-07 11:10:21 +03:00
Vladyslav
65015bfd73
[3.0] Improvement image map (#2740) 
* Fixed not correct center image map
Fixed update position marker for image map

* Add support IE and clear code

* Fix not correct update image for datasource

* Update marker position
 2020-05-07 11:09:56 +03:00
Igor Kulikov
e8ee8cb6d2 Fix tests 2020-05-07 11:09:12 +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
Artem Halushko
9ad09bb5ac Merge branch 'develop/3.0' of https://github.com/thingsboard/thingsboard into map/3.0 2020-05-07 10:29:47 +03:00
Igor Kulikov
e9553b627b Introduce OAuth failure handling 2020-05-06 20:30:02 +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
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
Artem Halushko
4890125423 trip-animation points & anchors 2020-05-06 19:09:41 +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
aabbe7735d Update haproxy.cfg with oauth rules 2020-05-06 14:37:30 +03:00
Igor Kulikov
d8c201a7fe OAuth button style improvement 2020-05-06 14:36:08 +03:00
Igor Kulikov
ced25c51c4 Improve OAuth buttons style 2020-05-06 12:44:47 +03:00
Igor Kulikov
c6bd82ddaa Merge branch 'master' into develop/3.0 2020-05-06 12:30:01 +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
cd5434587f Merge with master 2020-05-06 10:01:05 +03:00
Igor Kulikov
92c9bc0ae5 Improve oauth mapper - create default rule chains for tenant 2020-05-06 09:58:52 +03:00
Adsumus
af0cd5058e WIP on trip-animation settings 2020-05-06 09:33:43 +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
Igor Kulikov
9a14dd385d Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-05-05 18:19:43 +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
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