ayyoob
|
d70cea2e46
|
fixed commit issues
|
2017-06-22 19:29:04 +05:30 |
|
ayyoob
|
536d100fd6
|
fixed comment issues
|
2017-06-22 17:44:54 +05:30 |
|
ayyoob
|
abacc0ce2a
|
fixed comment issues
|
2017-06-22 17:28:37 +05:30 |
|
ayyoob
|
2dab109ad3
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
|
2017-06-22 16:56:34 +05:30 |
|
Ace
|
ac01fef7be
|
Adding import enhancements
|
2017-06-22 15:34:03 +05:30 |
|
Ace
|
dcbffac198
|
Adding fixes for https://github.com/wso2/product-iots/issues/997
|
2017-06-22 15:12:40 +05:30 |
|
ayyoob
|
6c041c7b6a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
|
2017-06-22 04:34:45 +05:30 |
|
Rasika Perera
|
fc4576082c
|
Changing artifact uploader admin service resource path
|
2017-06-21 10:57:50 +05:30 |
|
ayyoob
|
80cc690a42
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
|
2017-06-21 04:11:40 +05:30 |
|
WSO2 Builder
|
68cb8d3f81
|
[WSO2 Release] [Jenkins #2380] [Release 3.0.7] prepare for next development iteration
|
2017-06-20 22:37:58 +05:30 |
|
WSO2 Builder
|
d0f52c48ef
|
[WSO2 Release] [Jenkins #2380] [Release 3.0.7] prepare release v3.0.7
|
2017-06-20 22:37:45 +05:30 |
|
Geeth
|
3deffa99dd
|
Merge pull request #790 from dunithd/master
Adding an API method to retrieve an activity by it's ID and a device ID
|
2017-06-20 22:27:42 +05:30 |
|
WSO2 Builder
|
2896b55f5e
|
[WSO2 Release] [Jenkins #2378] [Release 3.0.6] prepare for next development iteration
|
2017-06-20 18:03:42 +05:30 |
|
WSO2 Builder
|
bdb57383b1
|
[WSO2 Release] [Jenkins #2378] [Release 3.0.6] prepare release v3.0.6
|
2017-06-20 18:03:28 +05:30 |
|
dunithd
|
4cf3e2d421
|
Adding an API method to retrieve an activity by it's ID and a device ID
|
2017-06-20 17:44:22 +05:30 |
|
WSO2 Builder
|
8badc2bc37
|
[WSO2 Release] [Jenkins #2375] [Release 3.0.5] prepare for next development iteration
|
2017-06-19 17:23:13 +05:30 |
|
WSO2 Builder
|
43182aede9
|
[WSO2 Release] [Jenkins #2375] [Release 3.0.5] prepare release v3.0.5
|
2017-06-19 17:22:58 +05:30 |
|
WSO2 Builder
|
f70535ed20
|
[WSO2 Release] [Jenkins #2373] [Release 3.0.4] prepare for next development iteration
|
2017-06-19 16:22:55 +05:30 |
|
WSO2 Builder
|
c3d154ee65
|
[WSO2 Release] [Jenkins #2373] [Release 3.0.4] prepare release v3.0.4
|
2017-06-19 16:22:42 +05:30 |
|
Harshan Liyanage
|
a21c374b00
|
Code refactoring.
|
2017-06-19 12:52:31 +05:30 |
|
Harshan Liyanage
|
074ceeb0c7
|
Merged with master
|
2017-06-19 12:46:22 +05:30 |
|
Harshan Liyanage
|
967efa1fee
|
Fixed user enrolled device showing problem which resolves wso2/product-iots#406
|
2017-06-19 12:41:22 +05:30 |
|
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 Hamza
|
2875fb2ca0
|
Merge pull request #755 from rasika/geo-fencing
Added Geo Service into Device Mgt Core
|
2017-06-17 12:20:10 +05:30 |
|
WSO2 Builder
|
e924a86d73
|
[WSO2 Release] [Jenkins #2368] [Release 3.0.3] prepare for next development iteration
|
2017-06-16 17:40:41 +05:30 |
|
WSO2 Builder
|
b35aaab992
|
[WSO2 Release] [Jenkins #2368] [Release 3.0.3] prepare release v3.0.3
|
2017-06-16 17:40:27 +05:30 |
|
Rasika Perera
|
8da1f62cd9
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
|
2017-06-16 15:50:45 +05:30 |
|
WSO2 Builder
|
2b76317f40
|
[WSO2 Release] [Jenkins #2366] [Release 3.0.2] prepare for next development iteration
|
2017-06-16 11:00:40 +05:30 |
|
WSO2 Builder
|
02bc10e6d2
|
[WSO2 Release] [Jenkins #2366] [Release 3.0.2] prepare release v3.0.2
|
2017-06-16 11:00:26 +05:30 |
|
ayyoob
|
f47d0deb1a
|
few changes after testing.
|
2017-06-16 03:48:08 +05:30 |
|
WSO2 Builder
|
1e58f762da
|
[WSO2 Release] [Jenkins #2365] [Release 3.0.1] prepare for next development iteration
|
2017-06-15 16:23:05 +05:30 |
|
WSO2 Builder
|
bae931f3c5
|
[WSO2 Release] [Jenkins #2365] [Release 3.0.1] prepare release v3.0.1
|
2017-06-15 16:22:51 +05:30 |
|
ayyoob
|
0d08c42f5e
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
|
2017-06-15 09:48:00 +05:30 |
|
WSO2 Builder
|
69d2cff7bd
|
[WSO2 Release] [Jenkins #2363] [Release 3.0.0] prepare for next development iteration
|
2017-06-14 18:08:46 +05:30 |
|
WSO2 Builder
|
3795011895
|
[WSO2 Release] [Jenkins #2363] [Release 3.0.0] prepare release v3.0.0
|
2017-06-14 18:08:31 +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 |
|
Rasika Perera
|
798e551673
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
|
2017-06-14 10:43:19 +05:30 |
|
WSO2 Builder
|
16420433b5
|
[WSO2 Release] [Jenkins #2352] [Release 2.0.75] prepare for next development iteration
|
2017-06-13 17:26:56 +05:30 |
|
WSO2 Builder
|
5c06b9dcb2
|
[WSO2 Release] [Jenkins #2352] [Release 2.0.75] prepare release v2.0.75
|
2017-06-13 17:26:42 +05:30 |
|
Rasika Perera
|
ce6ab9b354
|
Refactoring "executionPlanType" -> "alertType"
|
2017-06-12 22:43:14 +05:30 |
|
Rasika Perera
|
6d02075a99
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
|
2017-06-12 15:11:14 +05:30 |
|
ayyoob
|
22a4716443
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
|
2017-06-12 11:35:43 +05:30 |
|
WSO2 Builder
|
8927158086
|
[WSO2 Release] [Jenkins #2346] [Release 2.0.74] prepare for next development iteration
|
2017-06-09 12:57:29 +05:30 |
|
WSO2 Builder
|
28423c45bc
|
[WSO2 Release] [Jenkins #2346] [Release 2.0.74] prepare release v2.0.74
|
2017-06-09 12:57:15 +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 |
|
Harshan Liyanage
|
a30982207b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2017-06-07 16:29:15 +05:30 |
|
Harshan Liyanage
|
3766ba0349
|
Refactored DeviceMgmtProviderService to fetch only the required data which resolves product-iots#991
|
2017-06-07 16:29:05 +05:30 |
|