inosh
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolving merge conflicts

Browse Source
4.x.x
prabathabey 10 years ago
parent d71ea209c2 0a824d9644
commit fc80514d74
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File

1
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementServiceProviderImpl.java
Unescape View File

@ -44,6 +44,7 @@ import org.wso2.carbon.device.mgt.core.service.DeviceManagementService;
import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil; import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil;
import java.io.IOException; import java.io.IOException;
import java.net.URLDecoder;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

2
features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/notification-messages.xml
Unescape View File

@ -21,7 +21,7 @@
<Notifications> <Notifications>
<EnrolmentNotifications> <EnrolmentNotifications>
<Header>Dear {title} {user-name},</Header> <Header>Dear {title} {user-name},</Header>
<Body>Please go to the following url and enrol your device</Body> <Body>You have been registered to the WSO2 MDM. Below is the link to enroll.</Body>
<Url>{downloadUrl}</Url> <Url>{downloadUrl}</Url>
<Footer> <Footer>
Best Regards, Best Regards,

Write Preview
Loading…
Cancel
Save