From 9f0f3a856000d125f549e79ec61f611e88597ad3 Mon Sep 17 00:00:00 2001 From: Megala Date: Thu, 13 Oct 2016 16:58:50 +0530 Subject: [PATCH 1/8] Fixing issues related with the roles of secondary user store --- .../app/pages/mdm.page.dashboard/public/js/dashboard.js | 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/pages/mdm.page.dashboard/public/js/dashboard.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/public/js/dashboard.js index 66f554c21..7247533cb 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/public/js/dashboard.js +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/public/js/dashboard.js @@ -56,6 +56,6 @@ $(document).ready(function () { updateStats("/api/device-mgt/v1.0/users/count", "#user-count"); } if ($("#role-count").data("role-count")) { - updateStats("/api/device-mgt/v1.0/roles?offset=0&limit=1", "#role-count"); + updateStats("/api/device-mgt/v1.0/roles?offset=0&limit=1&user-store=all", "#role-count"); } }); \ No newline at end of file From fd925919ed53c8d926a8728c574c4134506128a9 Mon Sep 17 00:00:00 2001 From: Hasitha Amal De Silva Date: Tue, 18 Oct 2016 14:55:21 +0530 Subject: [PATCH 2/8] Adopt common interceptor from identity server for appmgt authentication --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b24c1a987..4dc653136 100644 --- a/pom.xml +++ b/pom.xml @@ -1219,10 +1219,10 @@ 4.7.0 - 5.2.1 + 5.2.2 5.1.3 5.1.1 - [5.2.1, 6.0.0) + [5.2.2, 6.0.0) 4.6.0 From 73489f31940ad2478d1ab43e9ff88323f1452430 Mon Sep 17 00:00:00 2001 From: kamidu Date: Tue, 18 Oct 2016 18:48:36 +0530 Subject: [PATCH 3/8] UI fixes in ios related uis --- .../public/js/operation-mod.js | 7 +++++++ .../download-agent.hbs | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js index 1fb5660c0..d54f38bcf 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js @@ -103,6 +103,7 @@ var operationModule = function () { "EMAIL_OPERATION_CODE": "EMAIL", "AIRPLAY_OPERATION_CODE": "AIR_PLAY", "LDAP_OPERATION_CODE": "LDAP", + "DOMAIN_OPERATION_CODE": "DOMAIN", "CALENDAR_OPERATION_CODE": "CALDAV", "NOTIFICATION_OPERATION_CODE": "NOTIFICATION", "CALENDAR_SUBSCRIPTION_OPERATION_CODE": "CALENDAR_SUBSCRIPTION", @@ -148,6 +149,12 @@ var operationModule = function () { "passcodePolicyMaxFailedAttempts": operationPayload["maxFailedAttempts"] }; break; + case iosOperationConstants["DOMAIN_OPERATION_CODE"]: + payload = { + "emailDomains": operationPayload["emailDomains"], + "webDomains": operationPayload["webDomains"] + }; + break; case iosOperationConstants["RESTRICTIONS_OPERATION_CODE"]: payload = { "restrictionsAllowAccountModification": operationPayload["allowAccountModification"], diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.ios.download-agent/download-agent.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.ios.download-agent/download-agent.hbs index 950172f13..c4a0944ad 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.ios.download-agent/download-agent.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.ios.download-agent/download-agent.hbs @@ -61,7 +61,7 @@ under the License. --}} This results unavailability of Operations such as Send Notification, Get Location, Ring and Enterprise Wipe.

- Skip Agent Installer + Skip Agent Installer From fc3c9480763e469221823c3dadbe54c88565be96 Mon Sep 17 00:00:00 2001 From: Hasitha Amal De Silva Date: Tue, 18 Oct 2016 20:13:00 +0530 Subject: [PATCH 4/8] Upgrade appmgt version to official 1.2.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4dc653136..94dd47f8f 100644 --- a/pom.xml +++ b/pom.xml @@ -1207,7 +1207,7 @@ - 1.2.4-SNAPSHOT + 1.2.4 2.2.3-SNAPSHOT From 86174cc1ccc7ee9ec6bba0133747535b0689d223 Mon Sep 17 00:00:00 2001 From: kamidu Date: Tue, 18 Oct 2016 20:28:57 +0530 Subject: [PATCH 5/8] Version uodate and ui fixes --- .../templates/hidden-operations-android.hbs | 98 +++++++++---------- pom.xml | 2 +- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs index a032462b9..be99f83a9 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs @@ -68,16 +68,16 @@ - + - +
-    Allow cross profile copy-paste + Allow cross profile copy-paste @@ -1181,7 +1181,7 @@
-
+