Commit Graph

217 Commits

Author SHA1 Message Date
kamidu
22ec7aa695 Fixes for the ui isuess in EMM 2.2.0-beta 2016-10-05 12:25:37 +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
fd82cfcddd Added new agent with policy fix 2016-09-29 18:51:31 +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
charitha
975fb078b5 (cherry picked from commit d68c4c8) 2016-09-27 15:24:18 +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
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
Ace
0cb99be949 Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 2016-09-22 19:09:26 +05:30
harshanl
212dcae8e7 Added scheduled time to App-install operation 2016-09-22 18:26:13 +05:30
dilanua
215093b9a8 Updating android operation failure notification message format 2016-09-22 13:00:31 +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
dilanua
b99529d9d0 Fixing JIRA: https://wso2.org/jira/browse/EMM-1588 2016-09-21 11:21:35 +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
Ace
6c3ba5e688 Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 2016-09-20 18:02:42 +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
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
dilanua
19b6a334ad Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations 2016-09-18 07:34:44 +05:30
dilanua
8d338a584b Changing permissions - /devices/owning to /devices/owning-device 2016-09-17 17:23:21 +05:30
Ace
2a0b500935 Updating to latest appm/apim/identity dependencies 2016-09-14 17:23:33 +05:30
charitha
4cdf98b1db Update agent apk to latest 2016-09-13 17:24:57 +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
kamidu
05f540abf1 permission modifications 2016-09-09 17:48:26 +05:30
mharindu
cbae4e207d Implemented permission based authorization 2016-09-09 03:00:11 +05:30
charitha
bfba008218 Removed url from application uninstall
(cherry picked from commit 45a582e)
2016-09-08 10:21:44 +05:30
charitha
07c7f2b6ff Add validation to APK type
(cherry picked from commit 9da85ad)
2016-09-07 08:11:50 +05:30
harshanl
479deb8a49 Added logic to switch between GCM & LOCAL notification provider in Android 2016-09-05 17:46:08 +05:30
harshanl
814dcf9c8f Refactored Android APIs 2016-09-05 11:57:03 +05:30
charitha
2974447362 Add validation to APK download url 2016-08-31 20:35:11 +05:30
inoshperera
532f66ebc5 fixing the operations not getting applied to multiple devices 80, 73 2016-08-25 14:20:44 +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
d0512f93b7 Fixed EMM-1282 2016-08-18 11:06:43 +05:30
hasuniea
5e2a42d798 fixing app-install issue 2016-08-17 15:31:18 +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
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