Igor Kulikov
|
ced25c51c4
|
Improve OAuth buttons style
|
7 years ago |
|
Igor Kulikov
|
c6bd82ddaa
|
Merge branch 'master' into develop/3.0
|
7 years ago |
|
Igor Kulikov
|
c83d600bdd
|
Merge branch 'master' of github.com:thingsboard/thingsboard
|
7 years ago |
|
Igor Kulikov
|
175a9c903d
|
OAuth: activate user with empty password - to be able to set up it later
|
7 years ago |
Andrew Shvayka
|
b49a7f573b
|
Merge pull request #2736 from volodymyr-babak/bug/relation-concurrent-fix
Changed direct executors to db executors
|
7 years ago |
Volodymyr Babak
|
d67ab52309
|
Changed direct executors to db executors
|
7 years ago |
|
Andrew Shvayka
|
1c82df42e2
|
Merge pull request #2735 from volodymyr-babak/bug/relation-concurrent-fix
Bug/relation concurrent fix
|
7 years ago |
|
Volodymyr Babak
|
7a633ed60a
|
Fixed issue with cretion/delete of relation because of concurrent access to class variable
|
7 years ago |
|
Volodymyr Babak
|
03bcbf2304
|
Merge remote-tracking branch 'upstream/master'
|
7 years ago |
|
Igor Kulikov
|
cd5434587f
|
Merge with master
|
7 years ago |
|
Igor Kulikov
|
92c9bc0ae5
|
Improve oauth mapper - create default rule chains for tenant
|
7 years ago |
|
VoBa
|
549ab8addf
|
Exclude old spring-core version (#2733)
* Renamed env variabled. Added sync
* Exclude old spring-core version
|
7 years ago |
|
Volodymyr Babak
|
1c2361fedd
|
Exclude old spring-core version
|
7 years ago |
|
Igor Kulikov
|
9a14dd385d
|
Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0
|
7 years ago |
|
VoBa
|
8d0607d54c
|
Added/improved comments for OAuth 2 configuration (#2731)
* Renamed env variabled. Added sync
* Added/improved comments for OAuth 2 configuration
|
7 years ago |
|
Igor Kulikov
|
662e05e9a0
|
Fix oauth2 login button
|
7 years ago |
Vladyslav
|
69ca93e458
|
Updated URL for package markerClusterGoogle (#2732)
|
7 years ago |
|
Igor Kulikov
|
8ebc019041
|
Fix entity state controller name resolution
|
7 years ago |
|
Volodymyr Babak
|
4240ac10f2
|
Merge remote-tracking branch 'upstream/master'
|
7 years ago |
|
Igor Kulikov
|
45852c9bba
|
Merge branch 'master' into develop/3.0
|
7 years ago |
|
Igor Kulikov
|
294b0e9e68
|
Fix entity admin wudgets aliases
|
7 years ago |
|
Igor Kulikov
|
2a7e220fc3
|
Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0
|
7 years ago |
|
Andrii Shvaika
|
f07d7441b2
|
Change of the partition routing strategy
|
7 years ago |
|
Igor Kulikov
|
3ab8f42016
|
Cassandra to SQL boolean column fix
|
7 years ago |
|
Igor Kulikov
|
d1ca706b48
|
Fix Auth guard
|
7 years ago |
|
Igor Kulikov
|
b07732a681
|
Minor fixes
|
7 years ago |
|
Vladyslav
|
adc982923d
|
[3.0] Improvment image map (#2729)
* Add support setting position function
* Improved setting image map
* Add support setting offset marker
|
7 years ago |
|
Igor Kulikov
|
f7efb79015
|
Minor fixes
|
7 years ago |
|
Igor Kulikov
|
9953853f71
|
Refactoring
|
7 years ago |
|
Igor Kulikov
|
98a15cd098
|
Merge branch 'ArtemHalushko-map/3.0' into develop/3.0
|
7 years ago |
|
Igor Kulikov
|
503bca902a
|
Minor refactoring
|
7 years ago |
|
Igor Kulikov
|
6440f9acfe
|
Merge branch 'map/3.0' of https://github.com/ArtemHalushko/thingsboard into ArtemHalushko-map/3.0
|
7 years ago |
|
Igor Kulikov
|
66db4c7fef
|
Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0
|
7 years ago |
YevhenBondarenko
|
b8de64f3fb
|
fix problem with duplication mail dependencies
|
7 years ago |
|
YevhenBondarenko
|
3e92a6a8d8
|
fix spring versions conflict
|
7 years ago |
|
YevhenBondarenko
|
f1e651bb7d
|
improvements
|
7 years ago |
|
YevhenBondarenko
|
9f773fb37f
|
updated spring and netty versions, excluded log4j from zookeeper dependency
|
7 years ago |
|
Andrew Shvayka
|
a6648163bb
|
Revert "updated spring and netty versions, excluded log4j from zookeeper dependency"
This reverts commit 73805759f6.
|
7 years ago |
|
Andrew Shvayka
|
a167ee2e32
|
Revert "improvements"
This reverts commit 9d8a7f0426.
|
7 years ago |
Artem Halushko
|
cd88afea00
|
fix empty center position & fix entity id
|
7 years ago |
|
Andrii Shvaika
|
b592e88643
|
Default Statistics interval is 1 min
|
7 years ago |
|
YevhenBondarenko
|
9d8a7f0426
|
improvements
|
7 years ago |
|
YevhenBondarenko
|
73805759f6
|
updated spring and netty versions, excluded log4j from zookeeper dependency
|
7 years ago |
|
Igor Kulikov
|
b34122a30c
|
Fix docker hybrid db mode
|
7 years ago |
|
Artem Halushko
|
7245f88014
|
remove image map zoom
|
7 years ago |
|
Igor Kulikov
|
3a129de654
|
Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0
|
7 years ago |
|
Andrii Shvaika
|
830d02ef6a
|
Fix for HTTP and CoAP device activity
|
7 years ago |
|
Andrii Shvaika
|
2e148f6b7d
|
Merge branch 'master' of github.com:thingsboard/thingsboard
|
7 years ago |
|
Andrii Shvaika
|
962755735b
|
Fix for Server-side RPC in cluster mode
|
7 years ago |
|
Igor Kulikov
|
4d03c51743
|
Merge with master
|
7 years ago |
