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

1373 Commits

Author SHA1 Message Date
Andrii Shvaika
71f94358c4 Fix typos and added break statement 2020-05-07 10:49:44 +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
Igor Kulikov
c6bd82ddaa Merge branch 'master' into develop/3.0 2020-05-06 12:30:01 +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
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
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
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
f7efb79015 Minor fixes 2020-05-05 13:46:26 +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
Andrii Shvaika
b592e88643 Default Statistics interval is 1 min 2020-05-04 17:40:35 +03:00
Igor Kulikov
3a129de654 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-05-04 15:01:47 +03:00
Andrii Shvaika
2e148f6b7d Merge branch 'master' of github.com:thingsboard/thingsboard 2020-05-04 13:22:50 +03:00
Andrii Shvaika
962755735b Fix for Server-side RPC in cluster mode 2020-05-04 13:22:36 +03:00
Igor Kulikov
4d03c51743 Merge with master 2020-05-04 12:23:13 +03:00
Hamza Slama
6037f0f47a Rename Typo 2020-05-04 12:10:12 +03:00
Volodymyr Babak
fc46175e99 Renamed env variabled. Added sync 2020-05-04 12:09:21 +03:00
VoBa
c0dfa4861b
[WIP] [3.0] Added OAuth2 Support (#2709) 
* Added base impl for OAuth-2

* Added basic and custom OAuth2 user mappers

* Removed comment line

* Refactoring to review. Added tenantId and customerId. Added email tenant name strategy

* Revert debug logger

* Fixed compilation

* Test fixed

* Create UI for OAuthService

* Revert package-lock.json

* Add translate login es_ES

Co-authored-by: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
 2020-05-04 11:51:08 +03:00
Andrew Shvayka
c1b5fd5c57
Merge pull request #2714 from thingsboard/feature/queue-consumers-refactoring 
Feature/queue consumers refactoring
 2020-05-04 10:17:46 +03:00
Volodymyr Babak
4df25672b1 Revert debug logger 2020-05-04 00:21:58 +03:00
Volodymyr Babak
8dbc550fd3 Refactoring to review. Added tenantId and customerId. Added email tenant name strategy 2020-05-04 00:21:58 +03:00
Volodymyr Babak
d644dddcc9 Removed comment line 2020-05-04 00:21:58 +03:00
Volodymyr Babak
a563fdab3f Added basic and custom OAuth2 user mappers 2020-05-04 00:21:58 +03:00
Volodymyr Babak
7fc46010b7 Added base impl for OAuth-2 2020-05-04 00:21:58 +03:00
Andrii Shvaika
08ab9752fc Better logging of Rule Engine errors 2020-05-04 00:13:14 +03:00
Andrew Shvayka
e251bc5750 Improvement to deserialization and remove debug on dashboards 2020-05-02 18:12:43 +03:00
Andrii Shvaika
8d5c38b743 Queue refactoring 2020-05-01 17:43:13 +03:00
Andrii Shvaika
c6cf5c43ad Merge remote-tracking branch 'origin/master' into develop/3.0 2020-04-30 20:40:08 +03:00
Dmytro Shvaika
89d19fb368 fix typo 2020-04-30 18:43:43 +03:00
Andrii Shvaika
d866fc1503 Merge remote-tracking branch 'origin/master' into develop/3.0 2020-04-30 18:11:56 +03:00
Andrii Shvaika
a437eba585 Fixed default Rule Chain 2020-04-30 17:29:06 +03:00
Andrii Shvaika
91768dac40 Merge remote-tracking branch 'origin/master' into develop/3.0 2020-04-30 13:26:34 +03:00
ShvaykaD
56ac228662
[WIP] Improvements for PostgreSQL 11 partitioning. (#2681) 
* improvements for migration to postgres 11

* tests update

* fix typo

* throw exception if query execution failed
 2020-04-30 13:12:35 +03:00
Andrii Shvaika
88c67ceb64 Merge remote-tracking branch 'origin/master' into develop/3.0 2020-04-30 12:51:14 +03:00
Andrii Shvaika
4079daabcd Timeouts for Remote JS Executors 2020-04-30 12:50:41 +03:00
Igor Kulikov
ea775f7596 Handle component_descriptor contraints during migration 2020-04-29 18:39:05 +03:00
Igor Kulikov
44d24327c8 Improve database migration - create indexes after inserts 2020-04-29 16:58:41 +03:00
Igor Kulikov
22a18b016b Merge with master 2020-04-29 15:02:47 +03:00
Andrii Shvaika
5fa2e2fc49 Added automatic creation of relations for demo dashboard 2020-04-29 11:50:02 +03:00
Vladyslav
00efdeffd8
Clear code (#2692) 2020-04-29 11:36:23 +03:00
Igor Kulikov
969c03637d Merge branch 'master' into develop/3.0 2020-04-29 09:50:37 +03:00
Igor Kulikov
fa5c051476 Fix demo data loader: set tenantId for termostatAlarms asset 2020-04-29 09:50:22 +03:00
Igor Kulikov
bd8dc95b27 Merge with master 2020-04-29 09:40:51 +03:00