ayyoob
|
3b7d4d8966
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
|
2017-06-17 19:17:42 +05:30 |
|
ayyoob
|
ca33f035df
|
merge ui fixes
|
2017-06-17 18:52:25 +05:30 |
|
ayyoob
|
f47d0deb1a
|
few changes after testing.
|
2017-06-16 03:48:08 +05:30 |
|
ayyoob
|
07bdd5cb6c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
|
2017-06-14 13:19:07 +05:30 |
|
ayyoob
|
da68f8fac1
|
fixed on config operation flow
|
2017-06-14 12:38:56 +05:30 |
|
ayyoob
|
6c7f911cbc
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
Conflicts:
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.js
|
2017-06-08 14:39:51 +05:30 |
|
ayyoob
|
7ab52af66e
|
add http pushnotification
|
2017-06-08 14:24:33 +05:30 |
|