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
ayyoob
c93410eb92
added few changes after review
2017-06-12 11:35:33 +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
Chatura Dilan
f2db2609bd
Merge pull request #763 from janakamarasena/ouath-token-grant-v2
...
New OAuth grant type
2017-06-07 16:47:02 +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
Janak Amarasena
bdaa4088a3
Resolve reference errors
2017-06-07 14:09:41 +05:30
Janak Amarasena
848c219efe
Add scope validator
2017-06-07 14:09:41 +05:30
Janak Amarasena
a9a246c2c4
Add new oauth grant type
2017-06-07 14:09:41 +05:30
WSO2 Builder
e3dfbdfdbd
[WSO2 Release] [Jenkins #2342 ] [Release 2.0.73] prepare for next development iteration
2017-06-07 13:44:29 +05:30
WSO2 Builder
598332b640
[WSO2 Release] [Jenkins #2342 ] [Release 2.0.73] prepare release v2.0.73
2017-06-07 13:44:15 +05:30
inoshperera
9f9208cebc
adding default values for timestamp
2017-06-07 09:25:16 +05:30
WSO2 Builder
73fa026eeb
[WSO2 Release] [Jenkins #2340 ] [Release 2.0.72] prepare for next development iteration
2017-06-06 12:33:06 +05:30
WSO2 Builder
2415762ccb
[WSO2 Release] [Jenkins #2340 ] [Release 2.0.72] prepare release v2.0.72
2017-06-06 12:32:53 +05:30
ayyoob
f3393080ba
fixed few issues after testing
2017-06-06 11:00:59 +05:30
GDLMadushanka
36bd1c5daf
Refactoring
2017-06-06 09:44:30 +05:30
GDLMadushanka
85d07dc9cb
Redirecting to respective analytics pages depending on the device type
2017-06-05 09:35:46 +05:30
ayyoob
194e4d99b5
added policy compliance support
2017-06-05 00:12:59 +05:30
ayyoob
5b46dc03a5
few fixes on event reciever definition
2017-06-04 18:18:06 +05:30
ayyoob
7cba43ccbb
few changes after testing HTTP and MQTT flow
2017-06-04 06:52:29 +05:30
ayyoob
a7ebc96cb7
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-06-03 18:06:32 +05:30
ayyoob
a1b20f1663
changed response payload definition for pull notification
2017-06-03 13:27:08 +05:30
WSO2 Builder
39a7037821
[WSO2 Release] [Jenkins #2334 ] [Release 2.0.71] prepare for next development iteration
2017-06-02 16:44:55 +05:30
WSO2 Builder
22782ec125
[WSO2 Release] [Jenkins #2334 ] [Release 2.0.71] prepare release v2.0.71
2017-06-02 16:44:41 +05:30
Harshan Liyanage
9871122c0a
Code refactoring of device-status-task which Resolves harshanl/product-iots#518
2017-06-02 15:36:56 +05:30
Harshan Liyanage
52bbdfcd78
Code refactoring of device-status-task which Resolves harshanl/product-iots#518
2017-06-02 15:23:51 +05:30
Harshan Liyanage
fda9410a2a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-06-02 15:07:48 +05:30
Harshan Liyanage
d3cb7ba70b
Changed the device-status-task to use optimized queries which Resolves harshanl/product-iots#518
2017-06-02 15:07:39 +05:30
ayyoob
c46cbfafe5
Merge branch 'devicetype-3.1.0' of https://github.com/ayyoob/carbon-device-mgt into devicetype-3.1.0
2017-06-01 17:23:42 +05:30
ayyoob
4dc0f69e28
updated version
2017-06-01 17:23:18 +05:30
ayyoob
04b8b74e4f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-06-01 17:22:33 +05:30
ayyoob
a0d7518cbe
Implemented Pull Notification Support
2017-06-01 17:19:25 +05:30
ayyoob
8a56161a43
Implemented Pull Notification Support
2017-06-01 17:19:14 +05:30
WSO2 Builder
c7fd70145d
[WSO2 Release] [Jenkins #2331 ] [Release 2.0.70] prepare for next development iteration
2017-06-01 08:58:27 +05:30
WSO2 Builder
0c9d104401
[WSO2 Release] [Jenkins #2331 ] [Release 2.0.70] prepare release v2.0.70
2017-06-01 08:58:13 +05:30
Rasika Perera
aa0f9e0510
Merge pull request #744 from ayyoob/new-master
...
auto healing in case of app deletion and added device scope to handle to handle multiple session
2017-06-01 05:29:27 +05:30
Malintha Fernando
07f2cb608b
Fix : Store device type names as it is
2017-05-31 10:16:24 +05:30
Harshan Liyanage
4ec139608e
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-05-30 17:00:52 +05:30
Harshan Liyanage
35d1c9897e
Resolves harshanl/product-iots#518
2017-05-30 17:00:23 +05:30
WSO2 Builder
69a63baa43
[WSO2 Release] [Jenkins #2328 ] [Release 2.0.69] prepare for next development iteration
2017-05-30 11:24:51 +05:30
WSO2 Builder
713b948ea9
[WSO2 Release] [Jenkins #2328 ] [Release 2.0.69] prepare release v2.0.69
2017-05-30 11:24:37 +05:30
madhawap
c4d433a1a0
Fix for disabling reboot and upgrade-firmware operations on UI and Code formatting
...
In order to execute these two operations the enrolled device needs to have the system app installed. Therefore, in order to stop users from trying these two operations on cloud, the icons related to these two operations, on operation bar are disabled. In addition change a c-style for loop to a foreach loop in PolicyManagementServiceImpl.java
2017-05-29 20:13:51 +05:30
ayyoob
f03155a702
fixed missing import package issue
2017-05-29 11:36:09 +05:30
ayyoob
dbdaa5a0e0
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
2017-05-29 05:44:36 +05:30
ayyoob
c3f23fa564
fixed multi tenant issues after testing custom device type impl
2017-05-29 01:00:16 +05:30
Amal Gunatilake
2ac5a56ad0
Merge pull request #749 from madawas/master
...
Fixing wso2/product-iots##467
2017-05-26 15:25:25 +05:30
warunalakshitha
1a26595472
Fix issue with using enrollment id for device id
2017-05-26 14:54:04 +05:30
