10f8039349
Merge remote-tracking branch 'upstream/master' into feature/edge
6 years ago
2d235cf9eb
Improve Cassandra resultSet pagination
6 years ago
c0fde32a43
Revert changes
6 years ago
4fd263d3ea
moved thirdparty services to a separate file
6 years ago
0d0cdb8d9a
Revert versions
6 years ago
ef21d2ae41
Merge remote-tracking branch 'upstream/master' into feature/stateful-services
6 years ago
34da0fe811
Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0
6 years ago
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
6 years ago
7f53d53163
[3.0] Fixed polygon functionality ( #2747 )
* Add default setting and title for group
* Fix polygon: updateColor, functions tooltip and color polygon, update coordinate polygon
* Improvement code
* Refactoring code
6 years ago
76300e400e
Update Cassandra Driver
6 years ago
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>
6 years ago
b81370b6a0
Merge branch 'master' into develop/3.0
6 years ago
f2757e0535
Use source ip load balancing algorithm for http requests
6 years ago
4659ab7dd0
Improve table widgets mobile mode
6 years ago
e3e037c93e
Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0
6 years ago
0e45e45f55
Fix typo
6 years ago
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>
6 years ago
3280df3b9c
Merge branch 'develop/3.0' into map/3.0
6 years ago
9e860a3bf8
fixes
6 years ago
7a87e6c16d
Fix error update websocket to change user ( #2744 )
6 years ago
9db9c36bb3
Fix tests
6 years ago
15452dfe15
Fix error update websocket to change user ( #2743 )
6 years ago
bf258a94a3
Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0
6 years ago
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
6 years ago
e8ee8cb6d2
Fix tests
6 years ago
864a98fd8b
Merge branch 'master' of github.com:thingsboard/thingsboard
6 years ago
71f94358c4
Fix typos and added break statement
6 years ago
9ad09bb5ac
Merge branch 'develop/3.0' of https://github.com/thingsboard/thingsboard into map/3.0
6 years ago
e9553b627b
Introduce OAuth failure handling
6 years ago
0ce5222072
Merge branch 'master' into develop/3.0
6 years ago
d9bfd82926
Introduce OAuth failure handling
6 years ago
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>
6 years ago
4890125423
trip-animation points & anchors
6 years ago
f29c9c9452
Improve OAuth button style
6 years ago
ab27084e7e
Improve OAuth button style
6 years ago
aabbe7735d
Update haproxy.cfg with oauth rules
6 years ago
d8c201a7fe
OAuth button style improvement
6 years ago
ced25c51c4
Improve OAuth buttons style
6 years ago
c6bd82ddaa
Merge branch 'master' into develop/3.0
6 years ago
c83d600bdd
Merge branch 'master' of github.com:thingsboard/thingsboard
6 years ago
175a9c903d
OAuth: activate user with empty password - to be able to set up it later
6 years ago
b49a7f573b
Merge pull request #2736 from volodymyr-babak/bug/relation-concurrent-fix
Changed direct executors to db executors
6 years ago
d67ab52309
Changed direct executors to db executors
6 years ago
1c82df42e2
Merge pull request #2735 from volodymyr-babak/bug/relation-concurrent-fix
Bug/relation concurrent fix
6 years ago
7a633ed60a
Fixed issue with cretion/delete of relation because of concurrent access to class variable
6 years ago
03bcbf2304
Merge remote-tracking branch 'upstream/master'
6 years ago
cd5434587f
Merge with master
6 years ago
92c9bc0ae5
Improve oauth mapper - create default rule chains for tenant
6 years ago
af0cd5058e
WIP on trip-animation settings
6 years ago
549ab8addf
Exclude old spring-core version ( #2733 )
* Renamed env variabled. Added sync
* Exclude old spring-core version
6 years ago
Volodymyr Babak
Igor Kulikov
Vladyslav
Yevhen Bondarenko
ArtemHalushko
Artem Halushko
Andrii Shvaika
Adsumus