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

301 Commits

Author SHA1 Message Date
Igor Kulikov
29a6e7d91c Replace Velocity with Freemarker 2020-05-15 12:21:50 +03:00
Igor Kulikov
36457f8b13 Update mqtt paho client version. Completely remove old ui. 2020-05-15 10:23:45 +03:00
Andrii Shvaika
dc5eb6395a Version set to 2.5.1-SNAPSHOT 2020-05-13 14:07:31 +03:00
Igor Kulikov
fa5bbcd91b Version set to 2.5.0 2020-05-12 10:28:15 +03:00
Volodymyr Babak
10f8039349 Merge remote-tracking branch 'upstream/master' into feature/edge 2020-05-08 22:39:51 +03:00
Igor Kulikov
76300e400e Update Cassandra Driver 2020-05-08 15:45:54 +03:00
Igor Kulikov
cd5434587f Merge with master 2020-05-06 10:01:05 +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
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
YevhenBondarenko
9f773fb37f updated spring and netty versions, excluded log4j from zookeeper dependency 2020-05-04 21:55:36 +03:00
Andrew Shvayka
a6648163bb Revert "updated spring and netty versions, excluded log4j from zookeeper dependency" 
This reverts commit 73805759f6866c505586f813e5d860fe1f5b4bc9.
 2020-05-04 18:54:38 +03:00
Andrew Shvayka
a167ee2e32 Revert "improvements" 
This reverts commit 9d8a7f04265b4e4944b7668a5a1b443d75c5282c.
 2020-05-04 18:54:38 +03:00
YevhenBondarenko
9d8a7f0426 improvements 2020-05-04 17:35:08 +03:00
YevhenBondarenko
73805759f6 updated spring and netty versions, excluded log4j from zookeeper dependency 2020-05-04 17:35:08 +03:00
Igor Kulikov
4d03c51743 Merge with master 2020-05-04 12:23:13 +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
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
YevhenBondarenko
06c3caf082 refactored 2020-05-02 13:34:11 +03:00
Igor Kulikov
a4cd853a20 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-04-28 18:48:44 +03:00
Andrii Shvaika
eb3cc332d1 Fix gateway/device last activity time checks 2020-04-28 18:19:30 +03:00
Igor Kulikov
45f3d5324e Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-04-28 14:29:02 +03:00
YevhenBondarenko
4aa225baba added exclusions to azure dependency, and added logger level OFF to CoreMessageReceiver 2020-04-27 11:16:12 +03:00
Andrii Shvaika
91aa7a2700 Merge with master (2.5) 2020-04-27 00:40:21 +03:00
Andrew Shvayka
38ebbe2576 Revert "Merge with master. AlarmRepository.findAlarms is failing (#2663)" 
This reverts commit 2c02406ee5f41b08e655b634dd9871403f67149d.
 2020-04-24 19:42:32 +03:00
Andrew Shvayka
2c02406ee5
Merge with master. AlarmRepository.findAlarms is failing (#2663) 
* Merge with master. AlarmRepository.findAlarms is failing

* Fix Alarm repository. Add queue type list select.

Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io>
 2020-04-24 15:44:31 +03:00
Vladyslav
612a8c7dd1
[3.0] Minor fix (#2615) 
* Improvement tenant setting from mobile view

* Improvement timewindow setting from mobile view

* Improvement entity-view setting from mobile view

* Update license header and license config
 2020-04-14 11:38:30 +03:00
Yevhen Bondarenko
8442159811
[2.5] vulnerabilities (#2608) 
* Version updates

* added @Retention(RetentionPolicy.RUNTIME) for all custom Dao annotations.

* changed getId, setId to getUuid, setUuid from BaseEntity, improvement AbstractControllerTest

* fix rabbitmq

* fix RuleChainManagerActor

* refactored InMemory queue

Co-authored-by: Andrii Shvaika <ashvayka@thingsboard.io>
 2020-04-13 09:34:35 +03:00
Andrii Shvaika
2f6c6ad1fe Merge with master 2020-04-08 18:24:52 +03:00
Yevhen Bondarenko
45bd764e6f
Azure ServiceBus queue 
* created event hubs queue

* created servicebus queue

* refactored

* refactored
 2020-04-07 11:45:28 +03:00
Yevhen Bondarenko
a6e090ef86
Develop/2.5 pubsub (#2566) 
* created Aws Sqs Queue

* improvement AwsSqs providers

* created pubsub queue

* revert package-lock.json

* Aws sqs improvements

* Aws sqs improvements

* Aws sqs improvements

* Aws sqs improvements

* Created pubsub queue

* aws improvements

* aws improvements

* aws improvements

* added visibility timeout to aws queue

* pub sub improvements

* pub sub improvements

* aws sqs improvements

* pub sub improvements

* added comment to transport.yml about ack deadline
 2020-03-31 16:39:41 +03:00
Yevhen Bondarenko
2553cf6b6f
created Aws Sqs Queue (#2534) 
* created Aws Sqs Queue

* improvement AwsSqs providers

* revert package-lock.json

* Aws sqs improvements

* Aws sqs improvements

* Aws sqs improvements

* Aws sqs improvements

* aws improvements

* aws improvements

* aws improvements

* added visibility timeout to aws queue
 2020-03-30 19:13:34 +03:00
Volodymyr Babak
f3aa410c17 Merge branch 'feature/edge' into develop/3.0-edge 2020-03-25 23:27:26 +02:00
Volodymyr Babak
bfb25845e9 Merge branch 'develop/3.0' into develop/3.0-edge 2020-03-24 11:50:34 +02:00
Volodymyr Babak
f5034b4dcd Merge remote-tracking branch 'upstream/master' into feature/edge 2020-03-17 18:43:22 +02:00
Igor Kulikov
957a0c9e61 Merge with master 2020-03-11 14:14:46 +02:00
VoBa
aabc22d7d2
Non root docker user (#2460) 
* Non root docker user

* Fixes for user - signle user for all services

* Base image changed

* Fixes for pvc removal

* Moved to be in sync with PE

* Changed to TB repository
 2020-03-10 16:52:50 +02:00
YevhenBondarenko
d68ef2333a updated guava and protobuf versions 2020-03-10 16:14:01 +02:00
Volodymyr Babak
b97e82df7d Http -> Https fix 2020-03-06 11:28:29 +02:00
Volodymyr Babak
451c158742 Added EDGE backend support 2020-03-03 12:25:44 +02:00
Andrii Shvaika
45e3172cb3 Merge branch 'master' into develop/3.0 2020-02-21 15:48:31 +02:00
YevhenBondarenko
30eaa28f6c added rest-client dependencies 2020-02-21 13:42:44 +02:00
YevhenBondarenko
54b0de0c2c move rest-client to own module 2020-02-21 13:42:44 +02:00
Igor Kulikov
96d3b245b0 Revert to version 3.0.0-SNAPSHOT 2020-02-20 12:35:01 +02:00
Igor Kulikov
e9b2c3107e Merge with master 2020-02-20 12:33:36 +02:00
Igor Kulikov
3e2a87135f Prepare for merge with master 2020-02-20 10:26:43 +02:00