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

3550 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Kulikov
b34122a30c Fix docker hybrid db mode 2020-05-04 17:34:09 +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
830d02ef6a Fix for HTTP and CoAP device activity 2020-05-04 14:00:18 +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
Igor Kulikov
a4a4badb8d Fix Manage dashboard customers 2020-05-04 12:01:53 +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
Vladyslav
7013377d8c
[3.0] Improvement map (#2706) 
* Fix load custom marker image for Firefox

* Fix update polygon color
 2020-05-04 11:41:34 +03:00
ArtemHalushko
11db772ea2
bugfixes (#2705) 2020-05-04 11:40:54 +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
Andrew Shvayka
ce01e32949
Merge pull request #2716 from YevhenBondarenko/develop/2.5-js-executor 
[2.5] js executor
 2020-05-04 10:17:08 +03:00
YevhenBondarenko
00e32ee8a3 merge with feature/queue-consumers-refactoring 2020-05-04 09:39:04 +03:00
Vladyslav_Prykhodko
8b9bb6ebb2 Add translate login 2020-05-04 00:21:58 +03:00
Vladyslav
e66afcd26c Fix translate 2020-05-04 00:21:58 +03:00
Volodymyr Babak
dab185208a Test fixed 2020-05-04 00:21:58 +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
d2919ba30e Improvement to Clear Alarm Node 2020-05-03 02:17:17 +03:00
Andrew Shvayka
e251bc5750 Improvement to deserialization and remove debug on dashboards 2020-05-02 18:12:43 +03:00
YevhenBondarenko
06c3caf082 refactored 2020-05-02 13:34:11 +03:00
Andrii Shvaika
8d5c38b743 Queue refactoring 2020-05-01 17:43:13 +03:00
YevhenBondarenko
eedb383845 AWS improvements 2020-05-01 14:15:31 +03:00
Andrii Shvaika
c7f282d393 Refactoring of the Queue Consumers 2020-05-01 12:45:06 +03:00
Andrii Shvaika
c6cf5c43ad Merge remote-tracking branch 'origin/master' into develop/3.0 2020-04-30 20:40:08 +03:00
Andrii Shvaika
3d54384be7 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-04-30 20:39:05 +03:00
Andrii Shvaika
09d8823205 Race condition fix 2020-04-30 20:38:53 +03:00
YevhenBondarenko
9a66fc0248 Merge branch 'master' of https://github.com/thingsboard/thingsboard into develop/2.5-js-executor 2020-04-30 20:14:59 +03:00
YevhenBondarenko
e5c5aa705f refactored 2020-04-30 20:14:34 +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
702a8b6139 Force unsubscribe from Kafka topics 2020-04-30 18:10:05 +03:00
Andrii Shvaika
9b532e180e Merge branch 'master' of github.com:thingsboard/thingsboard 2020-04-30 17:29:18 +03:00
Andrii Shvaika
a437eba585 Fixed default Rule Chain 2020-04-30 17:29:06 +03:00
YevhenBondarenko
237c288050 Merge branch 'master' of https://github.com/thingsboard/thingsboard into develop/2.5-js-executor 2020-04-30 16:24:28 +03:00
YevhenBondarenko
9ef3445b77 refactored 2020-04-30 16:24:12 +03:00
Igor Kulikov
2f8c7bb6b0 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-04-30 15:48:21 +03:00
VoBa
e39ccaa2cc
[2.5] Improved login by params to support nagivation to different dashboards (#2702) 
* Improved login by params

* Fix

* Removed incorrect redirect

* Refactoring
 2020-04-30 15:48:07 +03:00
Igor Kulikov
3d2270e11e Minor improvements 2020-04-30 15:46:45 +03:00
VoBa
11d4ef74e8
[3.0] Improved login by params to support nagivation to different dashboards (#2703) 
* Improved login by params to support nagivation to different dashboards

* Refactorting
 2020-04-30 15:42:19 +03:00
Igor Kulikov
8b5793f203 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-04-30 15:39:00 +03:00
Andrii Shvaika
30a2d19d2d Fixes to Kafka JS headers issue 2020-04-30 15:17:39 +03:00
Andrii Shvaika
beb5d1d0ba Merge branch 'develop/2.5-js-executor' of https://github.com/YevhenBondarenko/thingsboard 2020-04-30 15:08:05 +03:00
Andrii Shvaika
4e153a9321 Merge remote-tracking branch 'origin/develop/3.0' into develop/3.0 2020-04-30 13:26:40 +03:00