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

373 Commits

Author SHA1 Message Date
Igor Kulikov
b32e0de731 Version set to 3.0.1-SNAPSHOT 2020-06-04 10:05:41 +03:00
YevhenBondarenko
a810933982 send email rule node and mail server improvements 2020-06-01 14:44:24 +03:00
YevhenBondarenko
1f065f99c9 added ui for send email rule node and refactored mail server 2020-06-01 14:05:01 +03:00
Andrii Shvaika
02dd9ecdb9 Merge with develop/2.5.1 2020-05-25 17:27:02 +03:00
Andrii Shvaika
670a218e6d Added ts to TbMsg 2020-05-25 15:28:55 +03:00
Andrii Shvaika
68151e6561 Refactored DEB/RPM builds for Java-based components 2020-05-21 15:43:01 +03:00
Igor Kulikov
56a7cb6905 Update rule nodes ui 2020-05-19 12:35:14 +03:00
Andrii Shvaika
d6ea7c30be Merge fixes from 2.5.1 2020-05-18 14:19:11 +03:00
YevhenBondarenko
c2596b8ecb added SequentialByOriginator queue to coap, http, mqtt and refactored 2020-05-15 14:55:23 +03:00
YevhenBondarenko
c2dd91d819 added proxy configs to send mail rule node and sysadmin 2020-05-13 17:59:31 +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
Igor Kulikov
34da0fe811 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-05-08 16:25:14 +03:00
VoBa
7e66fd2693
Fix for pem key with password (#2752) 
* Added activate user config. Fixed https issue

* Added possibility to encode PEM files encrypted with a private key - Integration

* Remove PE fixes
 2020-05-08 16:11:59 +03:00
Igor Kulikov
76300e400e Update Cassandra Driver 2020-05-08 15:45:54 +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
c6bd82ddaa Merge branch 'master' into develop/3.0 2020-05-06 12:30:01 +03:00
Volodymyr Babak
d67ab52309 Changed direct executors to db executors 2020-05-06 12:17:41 +03:00
Volodymyr Babak
7a633ed60a Fixed issue with cretion/delete of relation because of concurrent access to class variable 2020-05-06 11:10:54 +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
Igor Kulikov
4d03c51743 Merge with master 2020-05-04 12:23:13 +03:00
Andrew Shvayka
d2919ba30e Improvement to Clear Alarm Node 2020-05-03 02:17:17 +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
beb5d1d0ba Merge branch 'develop/2.5-js-executor' of https://github.com/YevhenBondarenko/thingsboard 2020-04-30 15:08:05 +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
Andrii Shvaika
5034fd6d37 Merge branch 'master' into develop/3.0 2020-04-30 11:21:34 +03:00
Andrew Shvayka
7a47cd503b Revert "Develop/2.5 js executor (#2685)" 
This reverts commit 1599b24c3a748599a84f877987f452579c997ccf.
 2020-04-30 11:19:50 +03:00
Igor Kulikov
6894b19b87 Merge with master 2020-04-30 09:46:07 +03:00
Yevhen Bondarenko
1599b24c3a
Develop/2.5 js executor (#2685) 
* moved kafka from service.js to own module

* created awsSqs, pubSub, rabbitmq js-executors

* revert RemoteJsInvokeService

* revert thingsboard.yml

* added queue settings to js-executor

* refactored queue factories

* added queue params to pubsub js-executor

* azure service bus js-executor
 2020-04-29 21:02:47 +03:00
Vladyslav_Prykhodko
e5fe102b3a Fix limit to set coordinate 2020-04-29 18:46:19 +03:00
YevhenBondarenko
43b2eedbd5 azure service bus js-executor 2020-04-29 18:27:53 +03:00
Igor Kulikov
3d71a5ba0e Update rule nodes ui 2020-04-27 09:46:39 +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
Igor Kulikov
19601e40ed Update rule node core config. 2020-04-24 16:26:58 +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
Andrew Shvayka
dbe0348042
Merge pull request #2621 from yefimov-andrey/dev-attributes-name-change 
changed device attributes name to clarify its functionality
 2020-04-22 19:37:45 +03:00
Andrii Shvaika
5dbf7d764c Default Dashboards 2020-04-22 18:52:34 +03:00
Igor Kulikov
a7a8623f9c Update rule nodes UI 2020-04-21 13:27:56 +03:00
Igor Kulikov
056f2a28a7 Update rule nodes ui 2020-04-17 16:07:30 +03:00
ShvaykaD
0a136588eb
CheckPoint Node ui, Queue Controller, queue-type-list directive (#2612) 
* init commit

* ui: service for queue

* merge with develop/2.5 & fix license

* queue directive

* queue directive

* queue-type-list directive & TbCheckPointNode

* added rulenode-core-config.js file

* added new rulenode-core-config.js

* Develop/2.5 check point node (#3)

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* Develop/2.5 check point node (#4)

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

* fixed mistakes to pull https://github.com/thingsboard/thingsboard/pull/2612

Co-authored-by: Dmitriymush <powder322@gmail.com>
Co-authored-by: Dmitriy Mushat <54553744+Dmitriymush@users.noreply.github.com>
 2020-04-15 17:48:47 +03:00
Andrii Shvaika
7c24b850fb Merge remote-tracking branch 'origin/master' into develop/2.5 2020-04-14 16:17:27 +03:00
Andrii Shvaika
0c54f836b3 Fixed tests 2020-04-14 16:17:08 +03:00
nordmif
69c42d243b changed device attributes name to clarify its functionality 2020-04-14 14:15:57 +03:00
Andrii Shvaika
e991c0ef23 No more Synchronization nodes 2020-04-14 08:44:34 +03:00
Andrii Shvaika
63bac58ae8 Implementation of statistics counters 2020-04-14 08:27:44 +03:00