From 9f0f3a856000d125f549e79ec61f611e88597ad3 Mon Sep 17 00:00:00 2001
From: Megala <ktumegala@yahoo.com>
Date: Thu, 13 Oct 2016 16:58:50 +0530
Subject: [PATCH 1/3] 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 <hastef.ds@gmail.com>
Date: Tue, 18 Oct 2016 14:55:21 +0530
Subject: [PATCH 2/3] 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 @@
         <carbon.deployment.version>4.7.0</carbon.deployment.version>
 
         <!-- Carbon Identity -->
-        <carbon.identity.framework.version>5.2.1</carbon.identity.framework.version>
+        <carbon.identity.framework.version>5.2.2</carbon.identity.framework.version>
         <identity.inbound.auth.oauth.version>5.1.3</identity.inbound.auth.oauth.version>
         <identity.inbound.auth.saml.version>5.1.1</identity.inbound.auth.saml.version>
-        <carbon.identity.version.range>[5.2.1, 6.0.0)</carbon.identity.version.range>
+        <carbon.identity.version.range>[5.2.2, 6.0.0)</carbon.identity.version.range>
 
         <!-- Carbon Multi-tenancy -->
         <carbon.multitenancy.version>4.6.0</carbon.multitenancy.version>

From fc3c9480763e469221823c3dadbe54c88565be96 Mon Sep 17 00:00:00 2001
From: Hasitha Amal De Silva <hastef.ds@gmail.com>
Date: Tue, 18 Oct 2016 20:13:00 +0530
Subject: [PATCH 3/3] 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 @@
 
 
         <!-- Carbon App Management -->
-        <carbon.appmgt.version>1.2.4-SNAPSHOT</carbon.appmgt.version>
+        <carbon.appmgt.version>1.2.4</carbon.appmgt.version>
 
         <!-- Carbon Device Management Plugins -->
         <carbon.devicemgt.plugins.version>2.2.3-SNAPSHOT</carbon.devicemgt.plugins.version>