Commit Graph

1771 Commits

Author SHA1 Message Date
Harshan Liyanage
e1afb5bcdc Merge branch 'master' of https://github.com/wso1/carbon-device-mgt-plugins 2016-11-24 13:40:06 +05:30
inoshperera
3b867a533d fixing http status code 2016-11-24 12:46:33 +05:30
Harshan Liyanage
6cc3f39dd3 Added security filters to emm-web-agent app 2016-11-24 12:36:36 +05:30
GPrathap
dd86f91de6 moved from org.wso2.carbon.device.mgt.iot.androidsense.analytics2 2016-11-23 23:49:51 +05:30
inoshperera
d9a449dd26 adding modify enrollment capability to save chnages in enrollment such as GCM token update 2016-11-23 12:36:05 +05:30
ayyoob
cf5525dc3f removed device type and feature annotation 2016-11-21 20:55:12 +05:30
ayyoob
d6bfce396d Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt-plugins into IoTS-1.0.0 2016-11-21 19:18:32 +05:30
ayyoob
c7a29f0637 few changes in coding issues 2016-11-21 19:14:21 +05:30
sinthuja
cf1782391f Merge remote-tracking branch 'origin/IoTS-1.0.0' into IoTS-1.0.0 2016-11-21 17:10:28 +05:30
sinthuja
d3d176ebdc fixing some issues in the andriod analytics carbon apps. 2016-11-21 17:10:10 +05:30
inoshperera
b027f5dbe9 adding a button and connection to ios factory reset backend API 2016-11-21 11:53:33 +05:30
Ace
f3de1cf85e Adding windows-web-agent 2016-11-21 11:15:30 +05:30
dilanua
1cce94cef9 Fixing operation button stuck issue 2016-11-20 22:31:27 +05:30
GPrathap
3d971d2bb7 removed @API and @Permission annotations and added @SwaggerDefinition and @Authorization annotations 2016-11-20 19:04:11 +05:30
dilanua
861c5f861e Updating device statistics menu item url 2016-11-20 12:09:59 +05:30
dilanua
dbeedf246b Adding deviceStatisticsEnabled property to check visibility of device-statistics menu item 2016-11-20 10:55:56 +05:30
ayyoob
bfb9c62968 changed device access verification approach 2016-11-20 02:37:42 +05:30
dilanua
edd400bde4 Changing menu item names 2016-11-18 19:54:59 +05:30
Ruwan
93ed31c584 Merge pull request #413 from ayyoob/IoTS-1.0.0
changes in operation bar and deployer files
2016-11-18 16:52:08 +05:30
ayyoob
68f1fb34fe changes in operation bar and deployer.xml 2016-11-17 23:33:26 +05:30
sinthuja
f3fc531a53 Adding the new version of android analytics carbon apps. 2016-11-17 22:51:54 +05:30
WSO2 Builder
61ca4c4900 [maven-release-plugin] prepare for next development iteration 2016-11-16 13:57:06 +00:00
WSO2 Builder
4746bf0c74 [maven-release-plugin] prepare release v3.0.0 2016-11-16 13:55:17 +00:00
Ace
ae33d236fa Adding android device-view changes 2016-11-16 15:43:23 +05:30
Ace
7e3df67548 Adding android-base-plugin 2016-11-16 15:07:44 +05:30
charitha
1170263139 Update component versions for IoTS-1.0.0 release 2016-11-16 13:32:45 +05:30
Dilan U. Ariyaratne
9c69e914e0 Merge pull request #409 from Megala21/master
Adding additional configurations to SSO
2016-11-16 11:04:25 +05:30
inoshperera
e25e9fd4a1 adding support for webclip uninstallation for ios 2016-11-16 09:33:43 +05:30
Megala
3ff394902e Removing unnecessary require statements 2016-11-15 23:04:51 +05:30
Megala
6d3fbc422f Adding link for the dashboard in tenant mode 2016-11-15 22:59:12 +05:30
Megala
57e46525f8 Changing the dashboard menu to be only visible for super-tenant users 2016-11-15 10:25:33 +05:30
Megala
dec2950f6e Adding additional configurations for app-conf 2016-11-13 19:21:15 +05:30
Malintha Fernando
5722a9fbe6 Fixing javax.xml.parsers.import.pkg.version issue 2016-11-11 14:04:23 +05:30
Ace
ea14e32337 Adding android-web-agent 2016-11-11 10:05:12 +05:30
Malintha Fernando
09f004bfd8 importing javax.xml package for javax.xml.XMLConstants 2016-11-11 06:38:36 +05:30
sinthuja
0ef0d871fb fixing the issues when reading the mqtt receiver configurations. 2016-11-10 21:23:14 +05:30
Kamidu Sachith Punchihewa
218e7aa58f Merge pull request #406 from Malintha/master
Adding secured documentBuilder factory
2016-11-10 15:08:25 +05:30
Malintha Fernando
13cb358153 Adding secured documentBuilder factory 2016-11-10 15:04:03 +05:30
Ace
3d32ad984c Adding fixes to android qr-gen code 2016-11-10 12:08:05 +05:30
kamidu
f5c3a55aa8 add dashboard link to emm webapp 2016-11-10 11:06:35 +05:30
sinthuja
6bb0387dac Merge remote-tracking branch 'origin/IoTS-1.0.0' into IoTS-1.0.0 2016-11-09 16:07:42 +05:30
sinthuja
3001a31a33 updating the secure-ui publisher name. 2016-11-09 16:07:29 +05:30
Madawa Soysa
40907a954a Adding cache prevention filter to emm-web-agent app 2016-11-09 15:06:02 +05:30
Ace
cea96cc841 Merging with master 2016-11-09 12:54:33 +05:30
Chatura Dilan
47ba440fbb fixed extends 2016-11-09 12:36:37 +05:30
Chatura Dilan
ca2d837ecc Merge branch 'IoTS-1.0.0' of github.com:wso2/carbon-device-mgt-plugins into IoTS-1.0.0 2016-11-08 18:05:02 +05:30
Chatura Dilan
9e78b87365 Fixed issue in device operation bar 2016-11-08 18:04:42 +05:30
Chatura Dilan
d6701ee04c Fixed issue in device view UI 2016-11-08 18:02:47 +05:30
Chatura Dilan
1f4cda26e9 Merge pull request #403 from GPrathap/IoTS-1.0.0
adding mb mqtt authorization extension
2016-11-08 16:05:30 +05:30
GPrathap
136f2f34b1 changing MQTT message broker port to 1886 2016-11-08 15:59:04 +05:30
GPrathap
c96f2a8162 adding mb mqtt authorization extension 2016-11-08 15:53:09 +05:30
Chatura Dilan
49dd83ed33 Adding CDMF operation bar to Android 2016-11-08 15:16:10 +05:30
Chatura Dilan
b207e5d624 Added missing units 2016-11-08 15:08:57 +05:30
ayyoob
ecdbf6d272 few changes in sample device types to load cdmc specific units 2016-11-07 00:51:47 +05:30
Ace
7d14e23d00 merging with upstream 2016-11-04 20:09:13 +05:30
Ace
daf37338c6 merging changes with upstream
partial
2016-11-04 19:41:33 +05:30
Ace
46ad530735 adding missing files
continuation from restructuring effort.
2016-11-04 19:17:21 +05:30
Ace
e38941e81e restructuring iot-plugins
removing mobile/iot base plugins and other restructuring
2016-11-04 19:16:44 +05:30
Chatura Dilan
3227f3f650 Chages to device view for Android 2016-11-04 11:17:41 +05:30
Chatura Dilan
269376a135 Changes to Android operation bar 2016-11-03 15:22:17 +05:30
Chatura Dilan
76887c4277 Merge branch 'IoTS-1.0.0' of github.com:wso2/carbon-device-mgt-plugins into IoTS-1.0.0 2016-11-03 14:50:55 +05:30
Chatura Dilan
1e3d8021e9 Adding Android and Windows operation bars 2016-11-03 14:48:14 +05:30
Megala
411d006f5e Updating apk 2016-11-02 11:15:52 +05:30
ayyoob
685d57b452 merged with origin 2016-11-02 09:44:42 +05:30
ayyoob
bd05fb721a merged with origin IoTS-1.0.0 2016-11-02 07:47:48 +05:30
sinthuja
d5a68fb5a9 Removing the mistakenly added getAllDevices permission from the andriod sense API 2016-11-01 18:38:34 +05:30
sinthuja
aa423787e8 Removing the mistakenly added getAllDevices from the andriod sense API 2016-11-01 18:37:09 +05:30
sinthuja
96e0ef92d7 Adding changes related to removing DAS components. 2016-11-01 18:35:09 +05:30
charitha
b5e8df5ddb Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0 2016-11-01 15:05:26 +05:30
charitha
6d10f5c9fb Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0 2016-11-01 15:02:41 +05:30
WSO2 Builder
c9861e9636 [maven-release-plugin] prepare for next development iteration 2016-10-31 11:57:15 +00:00
WSO2 Builder
3e664dc304 [maven-release-plugin] prepare release v2.2.5 2016-10-31 11:55:04 +00:00
kamidu
4acc2b6925 Fix for ios device details view 2016-10-31 16:30:06 +05:30
kamidu
cab7a8c2d6 Fiz ios related numeric view 2016-10-31 14:40:15 +05:30
kamidu
af9c525594 Fixing styling issues and adding new apk 2016-10-31 14:33:36 +05:30
kamidu
a9308c3f22 removing the unnessary ' ' from hbs files 2016-10-31 11:59:29 +05:30
Rasika Perera
a40ce98698 Make analytics and groups view disable for mobile plugins 2016-10-29 23:47:36 +05:30
Kamidu Sachith Punchihewa
4cd74f0a5c Merge pull request #393 from Megala21/master
Fixing EMM-1792
2016-10-28 08:39:42 +05:30
Harshan Liyanage
e7d79044d6 Merge branch 'master' of https://github.com/wso1/carbon-device-mgt-plugins 2016-10-28 01:59:54 +05:30
Harshan Liyanage
d92c89048a EMM-1783:Fix for enterprise and public ios app installation & uninstallation 2016-10-28 01:59:34 +05:30
Megala
53efe7d0d6 changing the android-agent according to new change 2016-10-27 23:51:59 +05:30
Megala
55efa84834 Fixing EMM-1792 2016-10-27 23:21:20 +05:30
Harshan Liyanage
494b545c4b Merge pull request #392 from Megala21/master
Fixing EMM-1787
2016-10-27 17:18:16 +05:30
Megala
287d27a332 Fixing EMM-1787 2016-10-27 16:35:45 +05:30
hasuniea
78e9d74031 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-27 13:33:26 +05:30
hasuniea
afd8e16c4c fixing ios LDAP issue 2016-10-27 13:32:50 +05:30
Harshan Liyanage
242253b8f2 Merge pull request #391 from shavidissa/master
Added swagger annotations and refined the messages
2016-10-27 12:21:26 +05:30
Shavindri
f6c0aeecfc Added swagger annotations and refined the messages 2016-10-27 12:05:17 +05:30
kamidu
3f39ebf757 Fix for EMM-1766 2016-10-27 09:23:40 +05:30
kamidu
5b6289326b Fixing ui issues in policy management 2016-10-26 18:37:54 +05:30
kamidu
de60fa325e Fix the ios- manage domain policy issue 2016-10-26 17:41:35 +05:30
Kamidu Sachith Punchihewa
5396a4ca9e Merge pull request #380 from madawas/modal-refactor
Refactoring pages to use new modal unit
2016-10-26 17:26:14 +05:30
inoshperera
b0ccf2d27d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-26 15:18:02 +05:30
inoshperera
87fc819364 fixing EMM-1788 calDAV policy validation issue 2016-10-26 15:17:52 +05:30
Harshan Liyanage
4fdc358786 Merge pull request #387 from Megala21/master
Fixing EMM-1779
2016-10-26 12:26:40 +05:30
Megala
fcdce211b7 Changing the required fields use css to add astriek 2016-10-26 11:57:56 +05:30
Saad Sahibjan
91f0722b1d Fix for variable declaration with single var 2016-10-26 10:24:55 +05:30
Megala
b752dc4d90 Merge remote-tracking branch 'upstream/master' 2016-10-26 09:16:45 +05:30
Megala
e23ecc5b64 Fixing EMM-1779 2016-10-25 17:34:53 +05:30
ayyoob
391cdbb435 avoided lazy initialization 2016-10-25 14:01:51 +05:30
ayyoob
ed708852dc fixed formatting issues 2016-10-25 13:58:01 +05:30
ayyoob
968fa4f837 added message directly to log 2016-10-25 13:57:36 +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
ayyoob
8cbd68bcc6 few changes after testing the configs 2016-10-24 11:41:15 +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
ayyoob
b195759dcf refactored device type after changes done for the deployer 2016-10-24 09:41:31 +05:30
ayyoob
8906d964b0 refactored device type after changes done for the deployer 2016-10-24 09:40:53 +05:30
dilanua
a2d9d4302c Fixing feature configured icon malfunctioning issue on switch double-click 2016-10-23 20:41:59 +05:30
ayyoob
59baa97926 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into st2 2016-10-23 14:36:05 +05:30
ayyoob
aa518e6b6c few changes to support the deployer 2016-10-23 14:24:15 +05:30
ayyoob
23138855a7 added changes in feature extraction for device types 2016-10-23 01:24:58 +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
ayyoob
6de419519e removed certificate configuration for device types 2016-10-09 22:14:11 +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
75f4e91004 Fixed conflicts and merged 2016-10-06 17:39:37 +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
c37ad8f56d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-04 15:15:47 +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
Rasika Perera
119a3e16c5 Fixes to android sense download 2016-10-03 21:22:39 +05:30
Rasika Perera
214e56770b Upgrading carbon-analytics version from 1.0.6-ALPHA to 1.2.8 2016-10-03 21:22:39 +05:30
Rasika Perera
20f0720a72 Styling improvements to the virtual firealarm agent download 2016-10-03 16:18:54 +05:30
Rasika Perera
6cbbb75c45 Fixing android sense download issue 2016-10-03 16:05:22 +05:30
Rasika Perera
d58b8f1f53 Fixing realtime analytics websocket authentication 2016-10-03 16:05:22 +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
Chatura Dilan Perera
97b52b3645 changes to pom.xml 2016-09-29 21:44:15 +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
ca952e2e6c Merge branch 'master' of https://github.com/rasika/carbon-device-mgt-plugins into iots-ga 2016-09-29 12:21:59 +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
warunalakshitha
799aba9dfd Fix osgi issue with package version conflicts of org.wso2.carbon.device.mgt.iot bundle 2016-09-29 00:45:27 +05:30
warunalakshitha
f258f0992d Fix compilation issue after migrating iot components to carbon 4.4.9 2016-09-29 00:44:23 +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
Rasika Perera
6ee958bbe7 Fixing JWT token issue for realtime analytics 2016-09-28 11:03:46 +05:30
charitha
a719c11d75 Update the agent application 2016-09-27 23:56:43 +05:30
Rasika Perera
85a382e16a Removed error log 2016-09-27 22:56:56 +05:30
Rasika Perera
177f77bde4 Fixing invalid device object returned 2016-09-27 21:57:53 +05:30
Rasika Perera
0d07295623 Fixing invalid invoker util URLs 2016-09-27 21:47:20 +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
Ace
2a2f749523 Adding appm extension component & feature 2016-09-26 21:34:13 +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
Rasika Perera
9cef6f0d8c Few Fixes to the virtual firealarm analytics view. 2016-09-26 11:18:22 +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
Rasika Perera
fd9c491637 Fixing virtual firealarm device download modal issue 2016-09-22 18:10:27 +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
Rasika Perera
b99bd42a91 Fixing download modal issue on virtual firealarm 2016-09-22 14:36:56 +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