Merge branch 'master' into feature/js-module

2 years ago · 1e3819626e
2 changed files with 481 additions and 112 deletions
--- a/application/src/main/java/org/thingsboard/server/service/mail/TbMailSender.java
+++ b/application/src/main/java/org/thingsboard/server/service/mail/TbMailSender.java
@ -67,6 +67,9 @@ public class TbMailSender extends JavaMailSenderImpl {
        if (jsonConfig.has("password")) {
            setPassword(jsonConfig.get("password").asText());
        }
+        if (jsonConfig.has("mailFrom")) {
+            setUsername(jsonConfig.get("mailFrom").asText());
+        }
        setJavaMailProperties(createJavaMailProperties(jsonConfig));
    }

--- a/ui-ngx/src/assets/locale/locale.constant-nl_BE.json
+++ b/ui-ngx/src/assets/locale/locale.constant-nl_BE.json