801 Commits

Author SHA1 Message Date
Volodymyr Babak
d76b9eff68 Changed default rule chain types on nodes 2020-06-26 13:13:59 +03:00
Volodymyr Babak
4b9642fc11 Moved getEdgeEventTypeByEntityType to EdgeUtils 2020-06-25 17:32:34 +03:00
Bohdan Smetaniuk
53eb60e67d fixes 2020-06-24 15:58:08 +03:00
Bohdan Smetaniuk
cd70b6fb54 fixed bug + some refractoring 2020-06-24 12:39:58 +03:00
Valerii Sosliuk
5022baa551 Fix Check alarm status 2020-06-24 12:23:22 +03:00
Volodymyr Babak
1633959912 Merge remote-tracking branch 'origin/feature/edge' into develop/3.0-edge 2020-06-19 16:06:49 +03:00
blackstar-baba
946881b0c0 close the stream after generateCertificate
close the stream after generateCertificate
2020-06-19 14:02:20 +03:00
Volodymyr Babak
d96b845407 Merge remote-tracking branch 'upstream/master' into develop/3.0-edge 2020-06-19 10:19:40 +03:00
Volodymyr Babak
f5ab5d7a25 Revert particular methods 2020-06-19 10:05:27 +03:00
Volodymyr Babak
21ee2aec11 Merge remote-tracking branch 'upstream/develop/2.5.3' into feature/edge 2020-06-18 19:24:34 +03:00
Volodymyr Babak
f4baab4969 Edge Notifitcation Service 2020-06-18 13:30:45 +03:00
YevhenBondarenko
8d9a5875ec added use system proxy properties 2020-06-17 10:56:45 +03:00
Volodymyr Babak
cd2908fb59 Refactoring notification engine 2020-06-16 16:49:27 +03:00
Yevhen Bondarenko
ebed307757
Added proxy configs to rest api call rule node (#2943)
* Added proxy configs to rest api call rule node

* added validation proxyHost and proxyPort

* refactored checkProxyPort

* TbHttpClient improvements
2020-06-16 10:13:22 +03:00
Andrii Shvaika
9d2e039220 Version set to 2.5.3-SNAPSHOT 2020-06-11 10:57:50 +03:00
Igor Kulikov
0206a8ab39 Merge branch 'develop/2.5.2' 2020-06-08 18:24:43 +03:00
Andrii Shvaika
65c644b86f Message is pushed to correct queue in case of duplication 2020-06-08 18:01:26 +03:00
Andrii Shvaika
480d4d6935 RPC Request Node improvement to avoid blocking 2020-06-08 17:17:18 +03:00
Igor Kulikov
8f54fc3989 Merge branch 'develop/2.5.2' 2020-06-05 12:56:11 +03:00
Andrii Shvaika
cc4f746b1d Using Exectutor in Kafka Node. NEVER use Fork-Join pool with parallelism 1 2020-06-05 12:54:27 +03:00
Igor Kulikov
bd98ce8deb Merge with develop/2.5.2 2020-06-04 10:11:35 +03:00
Igor Kulikov
78a91b8c27 Temporarily version set to 2.5.2-SNAPSHOT 2020-06-04 10:09:02 +03:00
Igor Kulikov
b32e0de731 Version set to 3.0.1-SNAPSHOT 2020-06-04 10:05:41 +03:00
Volodymyr Babak
3d3dd88710 Merge remote-tracking branch 'origin/develop/2.5.1' into feature/edge 2020-06-02 16:56:06 +03:00
Andrii Shvaika
a532ded5ae Version set to 2.5.2-SNAPSHOT 2020-06-01 16:11:57 +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
Volodymyr Babak
95ce5595fc Fixes after merge 2020-05-09 03:27:03 +03:00
Volodymyr Babak
10f8039349 Merge remote-tracking branch 'upstream/master' into feature/edge 2020-05-08 22:39:51 +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
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