Commit Graph

890 Commits

Author SHA1 Message Date
harshanl
d3902a861c updated agent to check the communication protocol before downloading apps 2016-10-13 12:15:52 +05:30
kamidu
b16730f70d Fix for EMM-1723 and Device view related ui fixes 2016-10-12 17:46:11 +05:30
harshanl
4e5f373c9c Updated agent.apk for alert size fix 2016-10-12 17:28:50 +05:30
thusithakalugamage
47f6147857 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-11 18:37:00 +05:30
thusithakalugamage
f3dec07a47 [EMM-1618] - related improvements on remaining occurences 2016-10-11 18:36:09 +05:30
harshanl
5de9e1a57f EMM-1731:Removed duplicate alert box 2016-10-11 16:48:16 +05:30
harshanl
5db518e5a8 EMM-1725:Added validation for system app 2016-10-10 16:50:46 +05:30
kamidu
1f0e39fddf Fix for EMM-1601 ad EMM-1708 2016-10-10 14:16:29 +05:30
Megala
9f75c3a9a9 Merge remote-tracking branch 'upstream/master' 2016-10-07 16:46:26 +05:30
Megala
588f75cef5 Changing android apk with the changes for GCM 2016-10-07 16:39:24 +05:30
Kamidu Sachith Punchihewa
cc0ae4444d Merge pull request #359 from thusithak/master
EMM 2.2.0-Alpha2 theme migration and issue fixes
2016-10-07 14:38:22 +05:30
kamidu
058c96e87c Fix for EMM-1468 2016-10-07 13:08:29 +05:30
thusithakalugamage
b2134d34d3 [EMM-1685] - fix and few other related improvements 2016-10-07 12:31:05 +05:30
kamidu
7635db3167 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-07 10:04:31 +05:30
kamidu
85e1241feb Fixing type check in device view 2016-10-07 10:04:25 +05:30
Kamidu Sachith Punchihewa
bd2197d489 Merge pull request #357 from thusithak/master
EMM 2.2.0-Alpha2 theme migration and issue fixes
2016-10-06 22:47:21 +05:30
kamidu
68840eae94 Fix for EMM-1680 2016-10-06 22:38:47 +05:30
harshanl
f43ba554d5 EMM-1678:Updated the oauth component versions 2016-10-06 19:44:47 +05:30
thusithakalugamage
324952defc policy edit button group clear fix 2016-10-06 18:57:49 +05:30
Milan Perera
2bda72a5ce Merge branch 'master' of https://github.com/wso1/carbon-device-mgt-plugins 2016-10-06 17:39:42 +05:30
Milan Perera
72329d93f0 Added pulse secure payload to UI 2016-10-06 17:36:13 +05:30
thusithakalugamage
06b2c44644 Header nav menu responsiveness improvements 2016-10-06 16:41:52 +05:30
kamidu
9f558ffd0f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-06 15:08:43 +05:30
kamidu
b3b429b664 Fixing EMM-1697 2016-10-06 15:00:01 +05:30
kamidu
db581a9575 removing redundence loggings 2016-10-06 12:20:52 +05:30
Kamidu Sachith Punchihewa
ffd5597828 Merge pull request #356 from Megala21/master
Fixing EMM-1688
2016-10-06 12:07:20 +05:30
Megala
10372a7f4e Changing the equality check 2016-10-06 11:50:57 +05:30
Megala
51d6baf1d2 Reformatting code 2016-10-06 11:48:23 +05:30
Megala
4c54ba434a Fixing EMM-1688 2016-10-06 11:31:45 +05:30
thusithakalugamage
97f3dcf4c7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-05 19:18:16 +05:30
thusithakalugamage
9d9e8a8195 [EMM-1694] - Header responsive issues fix 2016-10-05 19:18:06 +05:30
kamidu
7431654f25 Fix for device view consistancy problems 2016-10-05 18:15:11 +05:30
thusithakalugamage
3acaf47209 Device details view tablist container height defect fix 2016-10-05 12:50:47 +05:30
kamidu
22ec7aa695 Fixes for the ui isuess in EMM 2.2.0-beta 2016-10-05 12:25:37 +05:30
kamidu
5936884c16 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-05 12:23:04 +05:30
harshanl
529ed17f82 New android agent with complaince monitoring issue fix 2016-10-04 20:03:03 +05:30
thusithakalugamage
73a600713c resolving conflicts 2016-10-04 15:13:04 +05:30
kamidu
faf0f36683 Fix for EMM-1665 2016-10-04 13:27:21 +05:30
thusithakalugamage
0cbf647854 resolving conflicts 2016-10-03 11:56:57 +05:30
kamidu
19a2c1d1bd Fix for Jira issue : EMM-1639 2016-10-03 11:50:57 +05:30
hasuniea
2ad390b877 removing duplicate event related classes 2016-09-30 13:40:17 +05:30
Chatura Dilan Perera
0b66649841 [maven-release-plugin] prepare for next development iteration 2016-09-29 21:47:43 +05:30
Chatura Dilan Perera
362003c9ab [maven-release-plugin] prepare release v2.2.2 2016-09-29 21:47:34 +05:30
harshanl
821142b78d windows ui fix 2016-09-29 21:29:51 +05:30
harshanl
5062a8dfae Windows issue 2016-09-29 20:08:25 +05:30
harshanl
fd82cfcddd Added new agent with policy fix 2016-09-29 18:51:31 +05:30
Rasika Perera
2517b7b385 Merge pull request #354 from rasika/iots-ga
Merge iot-ga branch
2016-09-29 15:20:18 +05:30
Rasika Perera
9d92b71bab Merge pull request #1 from warunalakshitha/master
Upgrade iot product to latest carbon versions
2016-09-29 11:24:25 +05:30
Megala
90f509c065 Merge remote-tracking branch 'upstream/master' 2016-09-29 09:09:47 +05:30
Megala
c6b12f799f Adding the check on the existence of the database before creating one 2016-09-29 01:42:11 +05:30
dilanua
0ffce8b177 Improving device view UI - adding ios specific device details support 2016-09-28 21:28:04 +05:30
dilanua
0a9ba54bb7 Improving policy listing UI 2016-09-28 20:58:07 +05:30
dilanua
9dfd06f95e Fix for JIRA: https://wso2.org/jira/browse/EMM-1650 2016-09-28 15:44:32 +05:30
hasuniea
54ca0cacc5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-28 14:27:49 +05:30
hasuniea
2cc9a50b92 adding permission for windows enrollment 2016-09-28 14:27:16 +05:30
dilanua
8bb1428df8 Improving device view info.retrieval - UI 2016-09-28 14:11:25 +05:30
charitha
a719c11d75 Update the agent application 2016-09-27 23:56:43 +05:30
Harshan Liyanage
f8bc1ff3bf Merge pull request #352 from Megala21/master
EMM-1626 : Unable to retrieve device location for an enrolled android device
2016-09-27 17:59:01 +05:30
Megala
c55b62fdf4 Fixing EMM-1626 2016-09-27 17:40:29 +05:30
charitha
ea999bc98b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-27 15:24:36 +05:30
charitha
975fb078b5 (cherry picked from commit d68c4c8) 2016-09-27 15:24:18 +05:30
Megala
e51231fd66 Merge remote-tracking branch 'upstream/master' 2016-09-27 13:37:40 +05:30
Megala
135019f987 Fixing EMM-1626 2016-09-27 13:33:12 +05:30
dilanua
074abf3053 Fix for JIRA: https://wso2.org/jira/browse/EMM-1640 2016-09-27 12:46:50 +05:30
charitha
c0feb96590 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-27 11:22:19 +05:30
Chatura Dilan Perera
0cdde82c1b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-26 22:10:20 +05:30
Chatura Dilan Perera
f6de82bb77 Fixed android agent 2016-09-26 22:10:00 +05:30
Kamidu Sachith Punchihewa
47e6909f8d Merge pull request #349 from saadsahibjan/master
Fix for https://wso2.org/jira/browse/EMM-1584
2016-09-26 22:02:41 +05:30
Saad Sahibjan
d05280cdf5 Fix for https://wso2.org/jira/browse/EMM-1584 2016-09-26 21:59:38 +05:30
Kamidu Sachith Punchihewa
f6c77e9b9e Merge pull request #348 from saadsahibjan/master
Fix for https://wso2.org/jira/browse/EMM-1634
2016-09-26 20:24:23 +05:30
Saad Sahibjan
41865d07eb Fix for https://wso2.org/jira/browse/EMM-1634 2016-09-26 20:19:20 +05:30
Kamidu Sachith Punchihewa
3944c5489e Merge pull request #347 from saadsahibjan/master
Update the description of system update policy and whitelist applications - Android UI
2016-09-26 20:10:23 +05:30
dilanua
77836d80d9 Updating bulk operations info message 2016-09-26 20:07:16 +05:30
dilanua
17e7b92b23 FIX for JIRAS: https://wso2.org/jira/browse/EMM-1633 2016-09-26 19:52:54 +05:30
Rasika Perera
3f9bcd50ea Correcting appContext=>@app.context, self.publicUri=>@unit.publicUri/@page.publicUri, currentUser.username=>@user.username 2016-09-26 19:17:05 +05:30
Saad Sahibjan
e4741c0b73 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-26 19:14:12 +05:30
Saad Sahibjan
891d9601ba Update the description of system update policy and whitelist applications - Android UI 2016-09-26 19:03:23 +05:30
Rasika Perera
d8d69f3092 Updating modal name element 2016-09-26 18:52:52 +05:30
kamidu
e3a08d824a Resolve conflicts with master 2016-09-26 18:12:53 +05:30
kamidu
e4cc0f0c0c Fix for EMM-1329, EMM-1479 2016-09-26 18:06:45 +05:30
charitha
9886e2e75f Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt-plugins into carbon-kernel-4.4.3
# Conflicts:
#	components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ApplicationInstallation.java
(cherry picked from commit 257d6cd)
2016-09-26 18:01:46 +05:30
charitha
ba2acb5e75 Refactor code
(cherry picked from commit 01f2a91)
2016-09-26 18:01:12 +05:30
dilanua
9d35017744 FIX for JIRAS: https://wso2.org/jira/browse/EMM-1591,EMM-1590,EMM-1585 2016-09-26 17:28:22 +05:30
Rasika Perera
17dd96aa10 Returning correct representation of the device to template. 2016-09-26 17:15:12 +05:30
Rasika Perera
52dfcecb62 Updating devicemgt_admin into /api/device-mgt/v1.0. 2016-09-26 15:58:00 +05:30
hasuniea
fb6eded30c fixed device lock issue 2016-09-23 22:27:34 +05:30
hasuniea
fc61128b8b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-23 22:06:49 +05:30
hasuniea
ece43f53bd fixing windows issues 2016-09-23 22:06:14 +05:30
dilanua
bdd7703465 Fix for JIRA: https://wso2.org/jira/browse/EMM-1602 2016-09-23 20:33:02 +05:30
dilanua
7697c3ca39 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-23 19:47:12 +05:30
dilanua
ddea023fc2 Fixing the alignment issue of policy compliance listing of device view page 2016-09-23 19:46:48 +05:30
Ruwan
3d7dfa741b Merge pull request #346 from ruwany/carbon-kernel-4.4.7
Migrating kernel/apim/appm/identity to latest versions
2016-09-23 17:04:26 +05:30
dilanua
0d8da5f63f Fix for jira: https://wso2.org/jira/browse/EMM-1621 2016-09-23 16:02:53 +05:30
dilanua
f85e28c902 Fix for jira: https://wso2.org/jira/browse/EMM-1622 2016-09-23 15:57:04 +05:30
dilanua
8bd20911fe Refactoring application list view for improper text placement issues 2016-09-23 12:28:15 +05:30
dilanua
a92070f16e Fix for jira: https://wso2.org/jira/browse/EMM-1617 2016-09-23 11:45:13 +05:30
dilanua
4947664b4b Fix for jira: https://wso2.org/jira/browse/EMM-1617 2016-09-23 11:15:45 +05:30
dilanua
3a7dbb81ea Fix for JIRA: https://wso2.org/jira/browse/EMM-1616 2016-09-23 06:59:12 +05:30
dilanua
36eb2e2b16 Fix for JIRA: https://wso2.org/jira/browse/EMM-1615 2016-09-23 06:37:24 +05:30
dilanua
f47a1cdc55 Fix for JIRA: https://wso2.org/jira/browse/EMM-1614 2016-09-22 22:59:42 +05:30
dilanua
f5d95f0695 Fix for JIRA: https://wso2.org/jira/browse/EMM-1613 2016-09-22 22:45:28 +05:30
dilanua
2a4757539a Fix for JIRA: https://wso2.org/jira/browse/EMM-1593 2016-09-22 22:12:46 +05:30
dilanua
bff3b3ee12 Fix for JIRA: https://wso2.org/jira/browse/EMM-1610 2016-09-22 19:45:29 +05:30
Ace
0cb99be949 Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 2016-09-22 19:09:26 +05:30
dilanua
1cca664e96 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-22 18:35:30 +05:30
dilanua
36d4c7dfcb Updating emm device listing - UI 2016-09-22 18:35:13 +05:30
harshanl
212dcae8e7 Added scheduled time to App-install operation 2016-09-22 18:26:13 +05:30
dilanua
13aedbc6c6 Updating notifications side bar - UI 2016-09-22 18:19:28 +05:30
dilanua
1efbc15cdb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-22 15:58:31 +05:30
dilanua
d7872782cc https://wso2.org/jira/browse/EMM-1608 2016-09-22 15:58:13 +05:30
Rasika Perera
71784e6609 Fixing modal popups 2016-09-22 15:24:59 +05:30
Chatura Dilan
e0499a5d86 Merge pull request #345 from saadsahibjan/master
Remove unused COSU tab-Android EMM UI
2016-09-22 14:05:36 +05:30
Saad Sahibjan
9ac367cf8a Remove unused COSU tab-Android EMM UI 2016-09-22 14:04:06 +05:30
dilanua
b6a150da23 Fixing JIRA: https://wso2.org/jira/browse/EMM-1603 2016-09-22 13:59:06 +05:30
dilanua
6665ac2642 Improvements to notifications side bar - UI 2016-09-22 13:14:45 +05:30
dilanua
215093b9a8 Updating android operation failure notification message format 2016-09-22 13:00:31 +05:30
Chatura Dilan
6bd25a4aad Merge pull request #343 from saadsahibjan/master
Added validations for COSU create and edit configurations - Android E…
2016-09-21 16:00:18 +05:30
Chatura Dilan Perera
7174945f21 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-21 13:51:44 +05:30
Chatura Dilan Perera
ae99d189e7 Fixed logcat and events get APIs 2016-09-21 13:51:29 +05:30
Ace
282fe25b47 Fixing dependency related issues 2016-09-21 12:57:03 +05:30
dilanua
b99529d9d0 Fixing JIRA: https://wso2.org/jira/browse/EMM-1588 2016-09-21 11:21:35 +05:30
thusithakalugamage
706894cd89 resolving conflicts 2016-09-21 10:59:36 +05:30
dilanua
c4c2df3723 Updating device listing UI - EMM 2016-09-20 22:21:45 +05:30
dilanua
d25779e335 Updating notification side-bar message format 2016-09-20 20:21:37 +05:30
dilanua
87d8c75682 Updating notification side-bar message format 2016-09-20 19:15:24 +05:30
dilanua
ab14f9516c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-20 19:04:36 +05:30
dilanua
13d784009c Updating android operation failure notification message 2016-09-20 19:04:15 +05:30
Chatura Dilan Perera
eaaadfae32 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-20 18:02:56 +05:30
Ace
6c3ba5e688 Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 2016-09-20 18:02:42 +05:30
Saad Sahibjan
f5009d8406 Added validations for COSU create and edit configurations - Android EMM UI 2016-09-20 16:29:36 +05:30
kamidu
3bb8bcb79e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-20 14:46:52 +05:30
kamidu
6144d9eea2 Fic for EMM-1581 2016-09-20 14:46:08 +05:30
dilanua
cd7f63502a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-20 14:21:58 +05:30
dilanua
afea5fcfc6 Refactoring notifications side-pane - EMM UI 2016-09-20 14:21:40 +05:30
Chatura Dilan
a8319c6770 Merge pull request #342 from saadsahibjan/master
Adding COSU policy view configurations - Android EMM UI
2016-09-20 13:53:37 +05:30
Saad Sahibjan
31b9c0c3dd Adding COSU policy view configurations - Android EMM UI 2016-09-20 12:57:49 +05:30
dilanua
712f62aa43 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-20 12:50:44 +05:30
dilanua
00448814e8 Refactoring notifications side-pane - EMM UI 2016-09-20 12:50:18 +05:30
Saad Sahibjan
d18b9a4082 Adding COSU policy edit configurations - Android EMM UI 2016-09-20 12:39:10 +05:30
Ace
03c0108db5 Removing unwanted dependencies from windows api 2016-09-20 10:39:34 +05:30
Chatura Dilan Perera
bf72d212f7 [maven-release-plugin] prepare for next development iteration 2016-09-19 19:53:27 +05:30
Chatura Dilan Perera
18780e5274 [maven-release-plugin] prepare release v2.2.1 2016-09-19 19:52:58 +05:30
Chatura Dilan Perera
93cecb0ded Merge branch 'master' into release-2.2.1 2016-09-19 18:37:57 +05:30
dilanua
b65e99a4a7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-19 18:36:31 +05:30
dilanua
9add795fe4 Adding date picker to oper.bar - EMM 2016-09-19 18:35:34 +05:30
Chatura Dilan Perera
42b50b642a Merge branch 'master' into release-2.2.1 2016-09-19 18:01:54 +05:30
hasuniea
8c877b3071 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-19 17:57:27 +05:30
hasuniea
9ecbd4e1b4 fixing windows operation issue 2016-09-19 17:54:58 +05:30
Chatura Dilan Perera
4088c736eb Changes to android agent 2016-09-19 17:17:42 +05:30
dilanua
ed5af90c46 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-19 17:13:26 +05:30
dilanua
4c8094be4f Adding date-picker unit - EMM 2016-09-19 17:13:02 +05:30
hasuniea
29c1b055d9 fixing code conflicts 2016-09-19 16:29:04 +05:30
hasuniea
18e577a84a adding windowsplugin changes 2016-09-19 15:49:16 +05:30
Rasika Perera
245ea2b0d6 Fixing incorrect text formatting 2016-09-19 14:35:43 +05:30
dilanua
4e9b19f3a5 Updating android permissions - operation-bar 2016-09-19 14:20:49 +05:30
dilanua
4a78cd6ece Updating android permissions 2016-09-19 14:09:39 +05:30
Ace
a05dad6f4d Merging with master 2016-09-19 12:22:11 +05:30
Rasika Perera
35d9678075 Updating permissions on operation bar for windows and iOS 2016-09-19 10:19:58 +05:30
dilanua
42a5493a89 Fixing JIRA: https://wso2.org/jira/browse/EMM-1577 2016-09-18 17:02:12 +05:30
dilanua
9925a20964 Fixing JIRA: https://wso2.org/jira/browse/EMM-1576 2016-09-18 16:31:17 +05:30
dilanua
69efc7ada7 Updating operation-mod with windows operation apis 2016-09-18 16:07:10 +05:30
dilanua
d8ce43fe04 Updating windows api path lockreset-devices to lock-reset-devices 2016-09-18 15:57:07 +05:30
dilanua
9d486a5a0a Updating Device Listing - EMM UI 2016-09-18 10:27:17 +05:30
dilanua
a4ef821dc1 Updating Add Device Modal - UI 2016-09-18 10:05:24 +05:30
dilanua
2c22feec20 Updating Add Device Modal - UI 2016-09-18 09:59:43 +05:30
dilanua
7911e0cce6 Updating EMM dashboard - UI 2016-09-18 08:51:05 +05:30
dilanua
19b6a334ad Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations 2016-09-18 07:34:44 +05:30
dilanua
08c6ba0617 Correcting typo: diableScreenCapture to disableScreenCapture - Operation-mod & Policy UI 2016-09-17 20:06:18 +05:30
dilanua
8d338a584b Changing permissions - /devices/owning to /devices/owning-device 2016-09-17 17:23:21 +05:30
dilanua
ac6d0eda84 Adding COSU Policy Configs - Android EMM UI 2016-09-17 16:02:27 +05:30
Rasika Perera
a717c7effb Adding deviceName into notifications 2016-09-16 09:39:58 +05:30
Chatura Dilan
ac9f95f885 Merge pull request #338 from saadsahibjan/master
Added edit COSU policy configurations
2016-09-15 19:56:35 +05:30
Saad Sahibjan
d2cdb388b0 Added edit COSU policy configurations 2016-09-15 19:49:25 +05:30
kamidu
61a4d417c7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-15 19:44:52 +05:30
kamidu
0160bf5fee Fix for EMM-1546 2016-09-15 19:26:48 +05:30
Dilan U. Ariyaratne
72d2466f30 Merge pull request #336 from DimalChandrasiri/master
Adding supportive classes
2016-09-15 16:50:13 +05:30
thusithakalugamage
d33fbc99b1 [EMM-1571] Add policies page wizard styling and layout defects - edit pages 2016-09-15 15:07:14 +05:30
thusithakalugamage
9840310f02 [EMM-1571] Add policies page wizard styling and layout defects 2016-09-15 13:47:24 +05:30
Imesh Chandrasiri
abf6317d19 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-15 11:21:08 +05:30
Imesh Chandrasiri
9887016f04 Adding modal changes 2016-09-15 11:19:35 +05:30
Rasika Perera
6ad54b5f01 Fixing EMM-1351: Issue in components refresh function in device detail page 2016-09-15 09:18:21 +05:30
Rasika Perera
c9ec2bea01 Fixing EMM-1552: Policy Create view Allingment issue in final step 2016-09-15 08:53:16 +05:30
Rasika Perera
b576e23d97 Improvements to notifications side pane 2016-09-15 08:34:18 +05:30
Rasika Perera
9f258df1d2 Fixing EMM-1551: Notifications are flooded on side pane. 2016-09-15 08:34:00 +05:30
Rasika Perera
9b2f73acfb Fixing EMM-1557: Notifications anchor points to a wrong URL of the device. 2016-09-15 08:04:58 +05:30
Rasika Perera
5438a421de Fixing Permissions are not published for Windows through WebApp Lifecycle Listener 2016-09-15 07:33:00 +05:30
Ace
2a0b500935 Updating to latest appm/apim/identity dependencies 2016-09-14 17:23:33 +05:30
Rasika Perera
4d4b9fa8ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-14 14:13:14 +05:30
Saad Sahibjan
b0ec89938e Added COSU policy configurations 2016-09-14 13:24:31 +05:30
charitha
4cdf98b1db Update agent apk to latest 2016-09-13 17:24:57 +05:30
kamidu
58fe478b3e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-13 15:47:41 +05:30
kamidu
a8c97563ee Fix for the rendering issue in dashboard 2016-09-13 15:46:45 +05:30
Rasika Perera
625dd1a887 itMerge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-13 15:27:02 +05:30
Imesh Chandrasiri
489a7d57ae Adding popup modal content 2016-09-13 13:46:53 +05:30
thusithakalugamage
550e2a472e [EMM-1549] - Heading defect fix 2016-09-12 18:10:31 +05:30
thusithakalugamage
e9e4133ed3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-12 14:54:27 +05:30
dilanua
326dd9f50e Fixing JIRA: https://wso2.org/jira/browse/EMM-1544 2016-09-12 14:49:07 +05:30
thusithakalugamage
dc7bc22aa0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-12 14:39:34 +05:30
thusithakalugamage
606ee9a5a4 [EMM-1543] styling defect related markup fix 2016-09-12 14:39:23 +05:30
dilanua
0456c741e9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-12 14:21:18 +05:30
dilanua
6ee9a61ed1 Fixing json parser issue in operation-bar - UI 2016-09-12 14:20:01 +05:30
kamidu
388b1a5e76 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-12 14:13:14 +05:30
thusithakalugamage
a994779bd8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-12 12:28:18 +05:30
dilanua
0c77266640 Fixing operation-bar not showing issue on device listing page 2016-09-12 11:17:30 +05:30
thusithakalugamage
0bda2c88bd responsive tab panel component - markup rewrite for uuf - fix 2016-09-11 12:21:15 +05:30
Rasika Perera
b9f9783e9a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-11 07:52:06 +05:30
dilanua
4799fcca5f Adding permissions to operation-bar UI 2016-09-10 06:30:06 +05:30
Chatura Dilan Perera
89621ddfcb [maven-release-plugin] prepare for next development iteration 2016-09-09 21:48:18 +05:30
Chatura Dilan Perera
28898a85e9 [maven-release-plugin] prepare release v2.2.0 2016-09-09 21:48:05 +05:30
Rasika Perera
0790c0ed7f Fixing dashboard user count issue 2016-09-09 19:26:02 +05:30
Rasika Perera
3a7a74a001 Merge pull request #331 from thusithak/master
wizard component - layout defect fixes
2016-09-09 19:14:40 +05:30
Rasika Perera
6a44414a60 Merge pull request #330 from DimalChandrasiri/master
Modal Changes
2016-09-09 19:14:31 +05:30
thusithakalugamage
0b8fc5e99d wizard component - layout defect fixes 2016-09-09 18:52:20 +05:30
thusithakalugamage
4dc863b3fc wizard component - layout defect fixes 2016-09-09 18:44:42 +05:30
kamidu
2b2db7be39 permission modifications 2016-09-09 18:43:03 +05:30
Imesh Chandrasiri
224061e2d2 Modal Changes 2016-09-09 18:25:23 +05:30
kamidu
958d8004a2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-09 17:48:41 +05:30
kamidu
05f540abf1 permission modifications 2016-09-09 17:48:26 +05:30
Imesh Chandrasiri
33b4f90e00 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-09 17:13:35 +05:30
Imesh Chandrasiri
35bd87ade4 Popup Layout changes 2016-09-09 17:11:57 +05:30
Rasika Perera
751deed3e2 Adding permission annotations for windows operations 2016-09-09 17:01:23 +05:30
dilanua
febcfd57be Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-09 16:47:40 +05:30
dilanua
d97c67804b Adding ios operation endpoint changes - UI 2016-09-09 16:47:11 +05:30
Rasika Perera
3c845dc3bd Merge pull request #328 from thusithak/master
responsive tab panel component - markup rewrite for uuf
2016-09-09 16:40:44 +05:30
Chatura Dilan Perera
f57f7c5c1e changes to android agent 2016-09-09 16:29:42 +05:30
thusithakalugamage
1fb8781f75 resolving conflicts 2016-09-09 16:17:39 +05:30
thusithakalugamage
30c846ef95 responsive tab panel component - markup rewrite for uuf 2016-09-09 16:08:21 +05:30
dilanua
a9d00964d2 Updating emm device view with permissions 2016-09-09 15:32:05 +05:30
Imesh Chandrasiri
7d173ef763 QR Code Modal changes 2016-09-09 12:27:21 +05:30
Imesh Chandrasiri
32953a8411 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-09 11:44:32 +05:30
Imesh Chandrasiri
c92fbc6b0f modal code changes 2016-09-09 11:44:06 +05:30
Rasika Perera
acc3875b51 Adding pulse secure configurations 2016-09-09 11:12:45 +05:30
Rasika Perera
49a23f0518 Merge pull request #327 from DimalChandrasiri/master
adding modal changes
2016-09-09 10:46:56 +05:30
Imesh Chandrasiri
bbe9dfecd2 adding modal changes 2016-09-09 10:44:04 +05:30
mharindu
3d432707b2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-09 03:00:35 +05:30
mharindu
cbae4e207d Implemented permission based authorization 2016-09-09 03:00:11 +05:30
dilanua
ea7f62a980 Adding permissions to device listing and bug fixes 2016-09-08 23:21:57 +05:30
kamidu
082e708e8a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-08 18:43:32 +05:30
kamidu
41d2856e39 Enable permission check according to the new permissions 2016-09-08 18:43:25 +05:30
charitha
44ae50cc95 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-08 10:22:12 +05:30
charitha
bfba008218 Removed url from application uninstall
(cherry picked from commit 45a582e)
2016-09-08 10:21:44 +05:30
dilanua
617849c053 Updating policy UIs with API method updates 2016-09-07 16:24:17 +05:30
dilanua
eea91960b7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-07 14:58:09 +05:30
dilanua
435759f961 Updating policy listing - UI 2016-09-07 14:57:32 +05:30
Rasika Perera
71d7baf04f Fixing iOS enrollement check polling url 2016-09-07 14:33:16 +05:30
dilanua
6cf9dc1c67 Updating emm policy create UI 2016-09-07 14:15:43 +05:30
charitha
07c7f2b6ff Add validation to APK type
(cherry picked from commit 9da85ad)
2016-09-07 08:11:50 +05:30
Rasika Perera
b66da8c7cb Fixing android agent download url 2016-09-07 01:43:20 +05:30
harshanl
c8d9f7b4ac Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-06 11:11:58 +05:30
Rasika Perera
f97bedf208 Merge pull request #322 from thusithak/master
web agent layout defects, scrolling issues fixed
2016-09-06 10:49:03 +05:30
thusithakalugamage
b1e973dc06 web agent layout defects, scrolling issues fixed 2016-09-06 10:34:37 +05:30
Rasika Perera
94ff1ea3ef Fixing android agent download issue 2016-09-06 10:33:10 +05:30
Rasika Perera
86a48bd455 Making "host" HTTPS -> HTTP to fix android agent download issue 2016-09-06 10:33:10 +05:30
harshanl
479deb8a49 Added logic to switch between GCM & LOCAL notification provider in Android 2016-09-05 17:46:08 +05:30
mharindu
2b3967fd71 Partial commit of migration 2016-09-05 16:39:13 +05:30
harshanl
814dcf9c8f Refactored Android APIs 2016-09-05 11:57:03 +05:30
dilanua
af8905069d Adding missing stepper headers for policy-create UI 2016-09-02 12:18:26 +05:30
dilanua
16163a8edb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-01 16:54:33 +05:30
dilanua
2472a12939 Updating emm dashboard role links 2016-09-01 16:52:50 +05:30
Rasika Perera
03a8c73014 Caching enabled on emm-web-agent 2016-09-01 16:28:11 +05:30
Rasika Perera
078c29ab9d Now EMM mobile-base-plugin feature contains both devicemgt and emm-web-agent apps 2016-09-01 16:28:11 +05:30
Rasika Perera
38b65daeda Adding emm-web-agent app with new UUFv0.2 version. 2016-09-01 16:28:11 +05:30
charitha
2974447362 Add validation to APK download url 2016-08-31 20:35:11 +05:30
kamidu
e135764f30 Improving the ux of devic listing page 2016-08-30 16:37:22 +05:30
Rasika Perera
3da7ac2916 Merge pull request #318 from thusithak/master
Theme migration for 2.2.0
2016-08-26 16:58:20 +05:30
thusithakalugamage
910803703c mdm notification bar status msg and button markup update 2016-08-26 15:48:23 +05:30
hasuniea
0235e4a0da fixing ClassNotFoundException 2016-08-26 13:23:48 +05:30
thusithakalugamage
97325fab85 mdm navbar hamburger menu and menu open state icons correction 2016-08-26 11:52:11 +05:30
harshanl
e42bf394d9 Changed windows API package name 2016-08-25 17:11:36 +05:30
harshanl
16d9338dce Refactored windows APIs 2016-08-25 16:28:03 +05:30
inoshperera
532f66ebc5 fixing the operations not getting applied to multiple devices 80, 73 2016-08-25 14:20:44 +05:30
kamidu
dcc062faad Device management theam changed to follow the patten introdused in policy management 2016-08-23 17:19:41 +05:30
dilanua
fb30118aa2 Adding supported feature: DEVICE_UNLOCK entry to db 2016-08-22 16:30:32 +05:30
hasuniea
3a25572fda fixing EMM-1509 issue 2016-08-22 10:51:35 +05:30
hasuniea
d5297cf36e fixing empty device enrollment body exception 2016-08-19 19:40:23 +05:30
Chatura Dilan Perera
ca2e631076 Fix conflicts 2016-08-19 15:25:51 +05:30
Chatura Dilan Perera
7ff9204646 [maven-release-plugin] prepare for next development iteration 2016-08-18 22:52:56 +05:30
Chatura Dilan Perera
5e43c5bef9 [maven-release-plugin] prepare release v2.1.2 2016-08-18 22:52:47 +05:30
harshanl
a844573773 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-18 19:45:52 +05:30
dilanua
21eacedf8b Suppressing checked warnings 2016-08-18 16:04:46 +05:30
harshanl
d0512f93b7 Fixed EMM-1282 2016-08-18 11:06:43 +05:30
Chatura Dilan
76f14c13ab Merge pull request #317 from charithag/carbon-kernel-4.4.3
Fix for possible NPE that could happen due to null device or null pro…
2016-08-17 16:00:12 +05:30
charitha
2f2af6c46b Change indentations to tab as this file use tab indentations 2016-08-17 15:58:32 +05:30
charitha
8ba69c8b36 Change indentations to tab as this file use tab indentations 2016-08-17 15:58:02 +05:30
charitha
76a442e864 Fix for possible NPE that could happen due to null device or null property list. 2016-08-17 15:54:56 +05:30
hasuniea
5e2a42d798 fixing app-install issue 2016-08-17 15:31:18 +05:30
kamidu
33c490e229 adding missing units 2016-08-16 17:13:29 +05:30
kamidu
2486c3ff5d remove tables headers when there is no enroll devices in the system 2016-08-16 14:55:15 +05:30
Rasika Perera
c8e7ba4f54 Placeholders added to send notification form input elements 2016-08-16 12:23:29 +05:30
Rasika Perera
de786ee8c0 License updated for qr modal unit 2016-08-16 12:23:03 +05:30
Rasika Perera
a55e9a53ae Removed hardcoded app context on href links 2016-08-16 12:15:52 +05:30
Rasika Perera
784c2260e4 qr modal added to devices listing page 2016-08-16 12:15:52 +05:30
Rasika Perera
75b67a02bc qr modal added 2016-08-16 12:15:52 +05:30
Rasika Perera
e1071ef8f3 Reusable qr modal unit created 2016-08-16 12:15:52 +05:30
Rasika Perera
fe01c59ed4 Fixing notification send operation not sending notifications 2016-08-15 23:03:58 +05:30
hasuniea
0504f34e22 Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt-plugins into carbon-kernel-4.4.3 2016-08-15 21:03:26 +05:30
dilanua
fcd68eab59 Fixing owner undefined issue in device view 2016-08-15 18:37:51 +05:30
kamidu
3262a7d926 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-15 18:17:14 +05:30
kamidu
7cb4f51dd2 Fix the device location view isssues 2016-08-15 18:07:52 +05:30
kamidu
b8d91478d5 Device view and detail related ui fixes 2016-08-15 18:06:19 +05:30
mharindu
caf73209b9 Removed unrelevant changes 2016-08-15 15:58:58 +05:30
mharindu
695fdc1cad Fixed confusing error messages issue 2016-08-15 15:54:04 +05:30
mharindu
150f569d05 Fixed json parsing issue in android agent 2016-08-15 15:48:31 +05:30
hasuniea
8a9114dd88 removing vpn validatiion property 2016-08-15 12:36:32 +05:30
hasuniea
72dd424c09 fixing jira issue related blacklisted application 2016-08-15 12:33:04 +05:30
hasuniea
71e64ae672 fixing put configuration 2016-08-15 12:32:19 +05:30
dilanua
3cc2a8ca12 Fixing role retrieval issue in policy-mgt 2016-08-15 12:01:42 +05:30
ayyoob
9978452cca Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into com 2016-08-13 10:50:06 +05:30
ayyoob
255e6b5566 few changes to resolve after scope validation issue 2016-08-13 10:38:30 +05:30
kamidu
c5bb85e772 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-12 17:40:49 +05:30
kamidu
ad5b871a30 Fix the device view zone conflict 2016-08-12 17:40:42 +05:30
hasuniea
68f64c3ae1 adding windows devicemgt interface and impl 2016-08-12 16:31:47 +05:30
hasuniea
33bcfc62c5 removing vpn validatiion property 2016-08-12 16:30:34 +05:30
hasuniea
22ec736841 fixing log throwing issue for internal server error(500) 2016-08-12 16:14:40 +05:30
hasuniea
66813f7d40 fixing jira issue related blacklisted application 2016-08-12 16:01:49 +05:30
kamidu
f17261423f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-12 14:32:28 +05:30
kamidu
96503f8166 Fix the notification related issues in mdm.nav bar 2016-08-12 14:09:08 +05:30
ayyoob
2555a91b4d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into com 2016-08-12 14:01:09 +05:30
ayyoob
65ca57c6d5 added scope annotation 2016-08-12 12:27:03 +05:30
hasuniea
13e317e201 resolving android get config issue 2016-08-12 12:24:38 +05:30
ayyoob
38b9f017c3 merged with origin 2016-08-12 10:55:25 +05:30
ayyoob
d72297f214 resolved UI issues 2016-08-11 23:41:19 +05:30
kamidu
04d1a3912a Fix the device view related issues 2016-08-11 19:05:42 +05:30
dilanua
fe2b861932 Fixing incorrect link - policy create UI 2016-08-11 16:57:24 +05:30
dilanua
6b0aaf42f1 Adding updates to emm policy listing page 2016-08-11 15:08:32 +05:30
dilanua
ca4cb37d58 Adding emm policy listing UI 2016-08-11 11:05:25 +05:30
dilanua
bd5ef4158b Adding emm policy edit UI 2016-08-10 18:52:39 +05:30
dilanua
935b429198 Adding emm policy view UI 2016-08-10 18:34:35 +05:30
dilanua
aada09de10 Adding policy create UI updates 2016-08-10 18:06:26 +05:30
Ace
0ee28c91d2 Adding date validations when updating device enrollment 2016-08-10 14:26:39 +05:30
Ruwan
c32d9e3125 Bug fix
Adding bug fix
2016-08-10 12:59:29 +05:30
Ace
d997654011 Adding date validations when updating device enrollment 2016-08-10 12:47:02 +05:30
hasuniea
9cde2d815a refactoring windowsapi 2016-08-10 10:51:42 +05:30
Rasika Perera
5ea262947b Added emm specific policy creation unit extending cdmf.unit.policy.create 2016-08-10 08:43:00 +05:30
Rasika Perera
4c11157d4e Enrollment url by default same VM 2016-08-10 08:33:43 +05:30
mharindu
d253dd4552 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-09 19:16:20 +05:30
mharindu
141a7d0959 Added scopes to the config.json 2016-08-09 19:09:22 +05:30
hasuniea
a62544c68b refactoring windowsapi 2016-08-09 18:00:49 +05:30
Ace
a37d5dbfd9 Fixing user,device,role listing pages 2016-08-09 07:57:30 +05:30
mharindu
352574d2fe Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-08 19:29:36 +05:30
mharindu
9b43f83520 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-08 18:49:49 +05:30
mharindu
6e8f3f5db2 Modified scopes 2016-08-08 18:25:00 +05:30
hasuniea
1078b8b686 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-08 18:06:22 +05:30
hasuniea
4562b4d318 adding security fixes 2016-08-08 18:06:14 +05:30
inoshperera
0197ea964f Merge pull request #313 from charithag/master
Add missing BadRequestException to global exception wrapper
2016-08-08 10:42:36 +05:30
mharindu
ece7cb04ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-08 10:40:45 +05:30
dilanua
a71537b7bb Updating emm app name 2016-08-06 17:17:24 +05:30
charitha
8aa4f8b526 Add missing BadRequestException to global exception wrapper 2016-08-05 21:48:28 +05:30
Chatura Dilan Perera
defa494626 changed date format to ISO 8601 2016-08-05 09:06:13 +05:30
mharindu
0cf85c986a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-04 17:50:13 +05:30
mharindu
8ddee3b217 Refactored scopes 2016-08-04 17:47:26 +05:30
Chatura Dilan Perera
fedd717561 Added validations to firmware upgrade date 2016-08-04 16:53:17 +05:30
Chatura Dilan Perera
4dfa9ed732 Added validations to firmware upgrade date 2016-08-04 16:51:59 +05:30
hasuniea
16e306268f fixing javax cache issue 2016-08-04 16:35:31 +05:30
hasuniea
86056df434 fixing windows plugin relalted slf4j issue 2016-08-04 15:29:25 +05:30
ayyoob
d70c576ff0 refactored android configuration 2016-08-03 17:23:09 +05:30
mharindu
5f917e51f1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-03 12:53:36 +05:30
Rasika Perera
97eac5064e Fixed Requested resource /app/conf/reader/main.js not found 2016-08-02 23:11:42 +05:30
kamidu
8d151120df enabling policy wizard for android 2016-08-02 18:50:23 +05:30
kamidu
1f247e7faf Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-02 18:26:51 +05:30
inoshperera
a09defebfe Merge pull request #312 from charithag/master
Removed invalid property insertion.
2016-08-02 15:52:37 +05:30
Rasika Perera
3d25102d30 Adding enrollment url into view model 2016-08-02 15:49:46 +05:30
charitha
d186a48ed8 Removed invalid property insertion. 2016-08-02 15:47:46 +05:30
kamidu
bbbaac4d28 Fix for the 'Requested resource /app/conf/reader/main.js cannot be found' exception on startup 2016-08-02 15:43:44 +05:30
mharindu
a254d9efc4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-02 14:57:29 +05:30
mharindu
34ce9108a2 Added configuration modifcation permission 2016-08-02 14:57:00 +05:30
kamidu
e0d9e1659c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-02 14:14:54 +05:30
dilanua
42cfd92575 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-02 14:04:13 +05:30
dilanua
6fe83cd0ac Updating path changes to business-controllers 2016-08-02 14:03:50 +05:30
mharindu
57fb75a04b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-02 11:03:33 +05:30
kamidu
ea89c6685e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-02 10:32:44 +05:30
kamidu
6db9fc426e Fix the addd buttton 404 issue 2016-08-01 14:34:48 +05:30
hasuniea
a8102b8c42 fixing VERIFONEEMMPROF-26 2016-08-01 14:28:52 +05:30
mharindu
576bfb8236 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-01 12:27:30 +05:30
dilanua
18a9ad4b8a Updating EMM UI conf.json 2016-07-29 18:02:44 +05:30
kamidu
a38d38a86e Addting new nav bar without group management ui 2016-07-29 15:31:20 +05:30
mharindu
2b3dfa0ce2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-07-29 12:40:50 +05:30
Chatura Dilan
1fa5bdba44 Merge branch 'master' of github.com:wso2/carbon-device-mgt-plugins 2016-07-28 15:26:04 +05:30
Chatura Dilan
338d804dba Added validations for invalid device Ids 2016-07-28 15:25:29 +05:30
Ace
77bdbb5a57 Fixing QR code issue 2016-07-26 20:58:21 +05:30
mharindu
be73e9a659 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-07-26 14:16:09 +05:30
hasuniea
e4bfb6b6ef fixing deviceIdentifier validation issue 2016-07-26 09:47:37 +05:30
dilanua
01e32c86c8 Updating base ui app config reader 2016-07-25 05:54:32 +05:30
dilanua
0ef0a06d10 Updating emm config.json 2016-07-22 16:58:55 +05:30
mharindu
d2f02d128c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-07-22 16:50:37 +05:30
dilanua
f85dcc3f25 Updating emm config.json 2016-07-22 16:43:12 +05:30
Ace
c004824b81 removing console.log 2016-07-21 15:02:15 +05:30
mharindu
98d291fcd0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-07-21 14:32:43 +05:30
Ace
24624131a7 Adding EMM dashboard to mobile base UI 2016-07-21 07:43:41 +05:30
mharindu
965402a7ac Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-07-18 20:18:55 +05:30
mharindu
302f71b6d1 Fixed webapp name resolving issue and changed API context 2016-07-18 20:17:31 +05:30
Milan Perera
c1cc6f08d9 Removed device name regex pattern from bean validation 2016-07-15 19:55:40 +05:30
Ace
bff34e5030 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-07-15 12:01:42 +05:30
Ace
d802570be9 Adding app.conf for mobile base plugin 2016-07-15 12:01:31 +05:30
mharindu
1b006bc155 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-07-13 11:05:56 +05:30
Chatura Dilan
b9bc076036 Fixed issues in android permisson.xml 2016-07-12 15:14:18 +05:30
hasuniea
672d90472b adding validation 2016-07-12 12:48:09 +05:30
hasuniea
3836d393fa removing Device type from AndroidDevice bean 2016-07-12 11:58:23 +05:30
mharindu
6b939714d8 Changed context paths 2016-07-12 01:32:15 +05:30
mharindu
2563098948 Fixed conflicts and merged 2016-07-11 22:12:54 +05:30