From defa4946267a53953b124b08f08fdb16908e7c3b Mon Sep 17 00:00:00 2001 From: Chatura Dilan Perera Date: Fri, 5 Aug 2016 09:06:13 +0530 Subject: [PATCH 1/2] changed date format to ISO 8601 --- .../android/services/impl/DeviceManagementAdminServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementAdminServiceImpl.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementAdminServiceImpl.java index 7f1b92178c..7a2c1f20f0 100644 --- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementAdminServiceImpl.java +++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementAdminServiceImpl.java @@ -51,7 +51,7 @@ import java.util.List; public class DeviceManagementAdminServiceImpl implements DeviceManagementAdminService { private static final Log log = LogFactory.getLog(DeviceManagementAdminServiceImpl.class); - private static final String DATE_FORMAT = "MM-dd-yyyy hh:mm a"; + private static final String DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ssXXX"; @POST @Path("/lock-devices") From a71537b7bb745e4618c7ad1ca4677e12cce4117b Mon Sep 17 00:00:00 2001 From: dilanua Date: Sat, 6 Aug 2016 17:17:24 +0530 Subject: [PATCH 2/2] Updating emm app name --- .../main/resources/jaggeryapps/devicemgt/app/conf/app-conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/app-conf.json b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/app-conf.json index 75c4efe2bd..b26d93b60c 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/app-conf.json +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/app-conf.json @@ -1,5 +1,5 @@ { - "appName": "Enterprise Mobility Manager", + "appName": "WSO2 Enterprise Mobility Manager", "cachingEnabled": true, "debuggingEnabled": false, "permissionRoot": "/",