Merge authors:
Halvdan Hoem Grelland (halvdanhg)
Related merge proposals:
Merge into trunk : test-email : Code : DHIS
proposed by: Halvdan Hoem Grelland (halvdanhg)
revision-diff.txt (17.8 KB)
···
------------------------------------------------------------
revno: 15774 [merge]
committer: Lars Helge Overland <larshelge@gmail.com>
branch nick: dhis2
timestamp: Thu 2014-06-19 22:53:00 +0200
message:
Merged branch test-email from Halvdan Grealland. Implements function for sending test email to current user to verify that SMTP setup is correct.
added:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/email/
dhis-2/dhis-api/src/main/java/org/hisp/dhis/email/EmailService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/email/
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/email/DefaultEmailService.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/EmailController.java
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/EmailMessageSender.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventChartController.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemEmailSettings.vm
--
lp:dhis2
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to OpenID transaction in progress