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

1271 Commits

Author SHA1 Message Date
Vladyslav_Prykhodko
5395db64f5 Add setting 'Always display actions column' for Alarm widget table 2020-05-25 18:08:24 +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
Andrii Shvaika
dc5eb6395a Version set to 2.5.1-SNAPSHOT 2020-05-13 14:07:31 +03:00
Igor Kulikov
6bab8bd6d3 Merge branch 'master' into develop/3.0 2020-05-12 14:09:17 +03:00
Igor Kulikov
fa5bbcd91b Version set to 2.5.0 2020-05-12 10:28:15 +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
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
YevhenBondarenko
b8de64f3fb fix problem with duplication mail dependencies 2020-05-05 00:18:20 +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