Commit Graph

793 Commits

Author SHA1 Message Date
Megala
e23ecc5b64 Fixing EMM-1779 2016-10-25 17:34:53 +05:30
kamidu
51dac16206 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-25 12:06:17 +05:30
kamidu
8af596702b Fix payload issues in manage payload policy 2016-10-25 12:05:08 +05:30
Saad Sahibjan
eff6c9d367 Fix spacing issue 2016-10-25 12:00:54 +05:30
Saad Sahibjan
2d020f611e Merge conflicts 2016-10-25 11:32:21 +05:30
Geeth
00be80eb2a Merge pull request #382 from inoshperera/master
fixing EMM-1714 by removing the supervised mode only operations from …
2016-10-25 09:53:04 +05:30
inoshperera
b554ff76e8 fixing EMM-1714 by removing the supervised mode only operations from the UI 2016-10-25 09:44:17 +05:30
kamidu
0251ba2a4a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-24 16:49:26 +05:30
kamidu
7f4e1e3da0 Fix the ui issues in policy view,edit and create and device view sections 2016-10-24 16:48:49 +05:30
Megala
465ea0154d Fixing EMM-1778 2016-10-24 14:51:12 +05:30
Saad Sahibjan
5f50059d49 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-24 10:49:57 +05:30
Madawa Soysa
a31940e9d9 Refactoring pages to use new modal unit 2016-10-24 10:36:46 +05:30
dilanua
a2d9d4302c Fixing feature configured icon malfunctioning issue on switch double-click 2016-10-23 20:41:59 +05:30
hasuniea
2bc0d31af9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-21 22:21:42 +05:30
hasuniea
e63c2dd321 fixing ios email config policy issue 2016-10-21 22:21:31 +05:30
WSO2 Builder
19e0d65db0 [maven-release-plugin] prepare for next development iteration 2016-10-21 11:27:51 +00:00
WSO2 Builder
537a99d05d [maven-release-plugin] prepare release v2.2.4 2016-10-21 11:25:53 +00:00
kamidu
d460cf1370 Fixing wifi payload issue in ios policies 2016-10-21 16:33:44 +05:30
kamidu
79a25f15b7 Fix for ui issues in policy creation 2016-10-21 16:21:36 +05:30
Saad Sahibjan
3d90487466 Fix incorrect spacing - AFW COSU 2016-10-21 15:02:29 +05:30
Saad Sahibjan
ccdc64152c Fix incorrect spacing - AFW COSU 2016-10-21 14:56:38 +05:30
Saad Sahibjan
10e0ddd8b3 Fix incorrect spacing - AFW COSU 2016-10-21 14:31:32 +05:30
Saad Sahibjan
af4fdb0fdc Fix incorrect spacing - AFW COSU 2016-10-21 14:12:17 +05:30
dilanua
76827640f0 Fixing JIRA: https://wso2.org/jira/browse/EMM-1767 2016-10-20 15:13:03 +05:30
dilanua
67d660ef1f Fixing JIRA: EMM-1765 2016-10-19 19:08:34 +05:30
Vishanth
b3d89e38eb fixing the ios wifi payload 2016-10-19 17:28:23 +05:30
Saad Sahibjan
6f0b7cb5b7 Remove blank line space - AFW COSU 2016-10-19 15:37:27 +05:30
WSO2 Builder
b095196e65 [maven-release-plugin] prepare for next development iteration 2016-10-18 15:36:09 +00:00
WSO2 Builder
d455b13e62 [maven-release-plugin] prepare release v2.2.3 2016-10-18 15:33:59 +00:00
Kamidu Sachith Punchihewa
932d43f272 Merge pull request #371 from wso2/release-2.2.3
Release 2.2.3
2016-10-18 20:31:38 +05:30
kamidu
86174cc1cc Version uodate and ui fixes 2016-10-18 20:28:57 +05:30
Kamidu Sachith Punchihewa
d23af95cdd Merge pull request #369 from Megala21/master
Fixing count of roles
2016-10-18 20:26:10 +05:30
kamidu
73489f3194 UI fixes in ios related uis 2016-10-18 18:48:36 +05:30
Hasitha Amal De Silva
0e6b19d737 Revert fix on EMM1328 for revisiting later. 2016-10-17 18:39:11 +05:30
kamidu
50e9da2d11 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-17 18:00:41 +05:30
Hasitha Amal De Silva
29f91fbee2 EMM-1328 - Hide the COPE radio button and mandate the value of BYOD radio button to be true. 2016-10-17 15:40:09 +05:30
kamidu
f6cd675a1c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-17 10:21:21 +05:30
Megala
9a8a146d16 Merge remote-tracking branch 'upstream/master' 2016-10-17 08:54:59 +05:30
Milan Perera
ea4d7bc823 Merge branch 'master' of https://github.com/wso22/carbon-device-mgt-plugins 2016-10-17 07:56:57 +05:30
Milan Perera
63c40e8696 Fixed notification sending issue in iOS 2016-10-17 07:56:36 +05:30
Megala
65647fafad Merge remote-tracking branch 'upstream/master' 2016-10-15 21:49:48 +05:30
kamidu
b50979a697 Enable ios enrollment without agent installation 2016-10-14 20:50:12 +05:30
kamidu
f6b8847e69 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-14 20:01:45 +05:30
kamidu
ec138be594 Fixing the ui issue is ios policy modification and policy view 2016-10-14 20:01:32 +05:30
Kamidu Sachith Punchihewa
43117a2b75 Merge pull request #364 from DimalChandrasiri/master
Fix for the bug EMM-1719
2016-10-14 17:57:52 +05:30
thusithakalugamage
89336bb80f skip download agent link added 2016-10-14 17:32:35 +05:30
Megala
9aa84e7b55 Merge remote-tracking branch 'upstream/master' 2016-10-14 16:04:08 +05:30
Imesh Chandrasiri
cce96f26fc Fix for the bug EMM-1719 2016-10-14 14:48:45 +05:30
Imesh Chandrasiri
2dd86c80b4 Fix for the bug EMM-1719 2016-10-13 20:11:38 +05:30
thusithakalugamage
c3ea6e0853 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-13 18:54:09 +05:30
thusithakalugamage
70728a3e17 Fixing device detail view pannel height defect 2016-10-13 18:52:42 +05:30
Megala
7bd78f0558 Merge remote-tracking branch 'upstream/master' 2016-10-13 17:02:08 +05:30
Megala
9f0f3a8560 Fixing issues related with the roles of secondary user store 2016-10-13 16:58:50 +05:30
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