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

3882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andrii Shvaika
f07d7441b2 Change of the partition routing strategy 2020-05-05 16:11:10 +03:00
Igor Kulikov
3ab8f42016 Cassandra to SQL boolean column fix 2020-05-05 15:12:30 +03:00
Igor Kulikov
d1ca706b48 Fix Auth guard 2020-05-05 14:29:38 +03:00
Igor Kulikov
b07732a681 Minor fixes 2020-05-05 13:53:20 +03:00
Vladyslav
adc982923d
[3.0] Improvment image map (#2729) 
* Add support setting position function

* Improved setting image map

* Add support setting offset marker
 2020-05-05 13:47:37 +03:00
Igor Kulikov
f7efb79015 Minor fixes 2020-05-05 13:46:26 +03:00
Adsumus
746e63ab63 Merge branch 'develop/3.0' of https://github.com/thingsboard/thingsboard into map/3.0 2020-05-05 12:56:39 +03:00
Adsumus
22210e6833 Merge branch 'map/3.0' of https://github.com/ArtemHalushko/thingsboard into map/3.0 2020-05-05 12:52:46 +03:00
Igor Kulikov
9953853f71 Refactoring 2020-05-05 12:19:21 +03:00
Igor Kulikov
98a15cd098 Merge branch 'ArtemHalushko-map/3.0' into develop/3.0 2020-05-05 11:57:50 +03:00
Igor Kulikov
503bca902a Minor refactoring 2020-05-05 11:57:35 +03:00
Igor Kulikov
6440f9acfe Merge branch 'map/3.0' of https://github.com/ArtemHalushko/thingsboard into ArtemHalushko-map/3.0 2020-05-05 09:35:49 +03:00
Igor Kulikov
66db4c7fef Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-05-05 09:34:38 +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