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
Andrew Shvayka
bd40edfd14
Merge pull request #2830 from ShvaykaD/develop/2.5.1 
added inserts strategy for upgrade to 2.5 if copy to/from files failed
 2020-05-27 13:17:17 +03:00
YevhenBondarenko
587bd387b8 Merge branch 'develop/2.5.1' of https://github.com/thingsboard/thingsboard into develop/2.5.1 2020-05-27 12:22:32 +03:00
Igor Kulikov
2d7d83f013 Merge branch 'develop/2.5.1' 2020-05-27 10:08:03 +03:00
Volodymyr Babak
1b1fedf1d0 Proper handle error cases in OAuth 2 success handler 2020-05-27 09:37:16 +03:00
Igor Kulikov
b124f86a0f Merge branch 'develop/2.5.1' 2020-05-26 18:08:30 +03:00
Dmytro Shvaika
2e08805e07 fix upgrade on RDS using insert strategy 2020-05-26 16:14:37 +03:00
Andrii Shvaika
e823dfb85d Min RPC timeout 2020-05-26 12:24:03 +03:00
Igor Kulikov
24ffaf26b7
Merge pull request #2835 from vvlladd28/improvement/minor-fix 
[3.0] Improvement ui
 2020-05-26 09:22:24 +03:00
Andrii Shvaika
bda1e7c4bf Removed deprecated tests 2020-05-25 18:25:36 +03:00
Vladyslav_Prykhodko
5395db64f5 Add setting 'Always display actions column' for Alarm widget table 2020-05-25 18:08:24 +03:00
Andrii Shvaika
02dd9ecdb9 Merge with develop/2.5.1 2020-05-25 17:27:02 +03:00
Andrii Shvaika
2c0b8c6f82 Ignore unstable test 2020-05-25 17:07:50 +03:00
Andrii Shvaika
be3ff963d4 Build fix 2020-05-25 16:14:30 +03:00
Andrew Shvayka
ffe9a40b47
Merge pull request #2816 from YevhenBondarenko/develop/2.5.1-gateway 
[2.5.1] DefaultTransportApiService improvements
 2020-05-25 15:39:13 +03:00
Dmytro Shvaika
f8a355fec8 added upgrade from version 2.5.0 2020-05-25 15:28:55 +03:00
YevhenBondarenko
9e4387af2e refactored 2020-05-25 13:15:38 +03:00
Dmytro Shvaika
ee7c4f6e7f added inserts strategy for upgrade to 2.5 2020-05-25 12:51:00 +03:00
YevhenBondarenko
1a285ff9a1 added test update entity by different tenant to controllers tests 2020-05-25 12:02:52 +03:00
YevhenBondarenko
8d3a797f56 controllers improvements 2020-05-22 19:28:40 +03:00
YevhenBondarenko
14039d9151 added gatewayId to metadata in ENTITY_CREATED event msg 2020-05-22 16:15:56 +03:00
YevhenBondarenko
d031431c64 DefaultTransportApiService improvements 2020-05-22 11:48:04 +03:00
Andrew Shvayka
8e6bd7aebc
Merge pull request #2814 from thingsboard/feature/packaging 
Feature/packaging
 2020-05-22 09:15:18 +03:00
YevhenBondarenko
8683357d73 controllers improvements 2020-05-22 02:29:05 +03:00
Volodymyr Babak
d610c115d3 Changed default processing timeout 2020-05-21 17:26:45 +03:00
Andrii Shvaika
3ea881f03b Stage 1 refactoring 2020-05-21 11:51:51 +03:00
viktor
4ed334a5d5 Merge branch 'develop/2.5.1' into oauth2-default-dashboard 2020-05-21 10:26:32 +03:00
viktor
cd66290ba5 Check and set default dashboard in OAuth2Mapper 2020-05-20 18:28:25 +03:00
viktor
cac7eb0d2b Added 'alwaysFullScreen' and 'defaultDashboardName' oauth2 properties 2020-05-20 18:27:26 +03:00
Igor Kulikov
1702ba5536 Fix compilation 2020-05-19 20:28:14 +03:00
Igor Kulikov
135aa8ddb9 Fix migration script 2020-05-19 15:56:51 +03:00
Andrii Shvaika
d6ea7c30be Merge fixes from 2.5.1 2020-05-18 14:19:11 +03:00
Andrii Shvaika
acf900e1de Fix for claim devices and shared/client attribute updates over WS 2020-05-18 13:04:07 +03:00
Igor Kulikov
5c667ba7fe
Merge pull request #2785 from vvlladd28/improvement/3.0/trip-animation 
Improvement trip animation
 2020-05-18 11:08:33 +03:00
Vladyslav_Prykhodko
a1b84834fc Update trip-animation widget 2020-05-18 10:58:46 +03:00
Volodymyr Babak
7ef0d9d603 Use equals instead of == 2020-05-15 19:34:30 +03:00
YevhenBondarenko
f5b4ebbd1b refactored 2020-05-15 14:55:23 +03:00
YevhenBondarenko
ebee42a0ee separated max_requests_timeout for RemoteJsInvokeService 2020-05-15 14:55:23 +03:00
Igor Kulikov
29a6e7d91c Replace Velocity with Freemarker 2020-05-15 12:21:50 +03:00
YevhenBondarenko
c2dd91d819 added proxy configs to send mail rule node and sysadmin 2020-05-13 17:59:31 +03:00
Yevhen Bondarenko
7ee2cdfe3e
Fixes and refactoring (#2761) 
* fix sqs js executor and refactored RemoteJsInvokeService

* added REMOTE_JS_MAX_REQUEST_TIMEOUT=20000 for aws-sqs, pubsub, service-bus docker environments

* added REMOTE_JS_MAX_REQUEST_TIMEOUT=20000 for aws-sqs, pubsub, service-bus docker environments

* refactored

* docker-compose.pubsub.yml improvements

* rabbitmq js executor improvements
 2020-05-13 14:08:54 +03:00
Igor Kulikov
6bab8bd6d3 Merge branch 'master' into develop/3.0 2020-05-12 14:09:17 +03:00
ShvaykaD
b9bc280d57
Fix typo in upgrade logs (#2757) 
* update psql & timescale update

* fix windows upgrade

* fix typo in logging
 2020-05-11 11:47:17 +03:00
ShvaykaD
8d0d23e620
psql & timescale upgrade (#2748) 
* update psql & timescale update

* fix windows upgrade
 2020-05-11 11:19:01 +03:00
Igor Kulikov
2d235cf9eb Improve Cassandra resultSet pagination 2020-05-08 19:34:08 +03:00
Igor Kulikov
34da0fe811 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-05-08 16:25:14 +03:00
Igor Kulikov
76300e400e Update Cassandra Driver 2020-05-08 15:45:54 +03:00
Yevhen Bondarenko
424d631a69
added extra properties to kafka consumer (#2751) 
* added extra properties to kafka consumer

* added default values for kafka consumer properties in TbKafkaSettings

* Update TbKafkaSettings.java

* Update thingsboard.yml

Co-authored-by: Andrew Shvayka <ashvayka@thingsboard.io>
 2020-05-08 14:38:04 +03:00
Igor Kulikov
9db9c36bb3 Fix tests 2020-05-07 11:23:36 +03:00
Igor Kulikov
bf258a94a3 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-05-07 11:10:21 +03:00
Andrii Shvaika
864a98fd8b Merge branch 'master' of github.com:thingsboard/thingsboard 2020-05-07 10:49:57 +03:00