Vishanth
7da1067d68
fixing sql queries to compare owner in lowercase
2017-06-13 17:08:01 +05:30
Rasika Perera
4796f5934f
Fixed geo alerts notifications
2017-06-13 00:44:20 +05:30
Rasika Perera
73ab6f28c1
Fixed sidebar notifications
2017-06-13 00:40:10 +05:30
Rasika Perera
6470e8e3d2
Fixed sidebar notifications
2017-06-13 00:39:58 +05:30
Rasika Perera
c970167299
UI fixes for geo fencing
2017-06-12 22:43:36 +05:30
Rasika Perera
ce6ab9b354
Refactoring "executionPlanType" -> "alertType"
2017-06-12 22:43:14 +05:30
Rasika Perera
e1c5c72b1b
Adding geo fence exit alerts ui
2017-06-12 15:40:38 +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
ayyoob
c93410eb92
added few changes after review
2017-06-12 11:35:33 +05:30
Harshan Liyanage
951cd7b001
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-06-12 10:36:51 +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
f215b5ee44
Added comments to the device status configs.
2017-06-07 17:34:06 +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
Geeth
f3666ac175
Merge pull request #764 from harshanL/master
...
Fixes product-iots#991
2017-06-07 16:44:27 +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
Geeth
53f8c7e188
Merge pull request #762 from inoshperera/master
...
adding default values for timestamp
2017-06-07 10:07:46 +05:30
inoshperera
9f9208cebc
adding default values for timestamp
2017-06-07 09:25:16 +05:30
Pasindu
fefa318b05
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-06-07 07:20:38 +05:30
Rasika Perera
05b11a5099
Adding Exit Alerts feature
2017-06-06 14:55:04 +05:30
Rasika Perera
4f447305c9
Fixing minor issue in viewing geo fence
2017-06-06 14:50:52 +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
Madawa Soysa
cf8d13ce98
Merge pull request #760 from madawas/master
...
Parameterizing the iot-api-config file
2017-06-06 10:25:06 +05:30
Megala Uthayakumar
6776771fc7
Merge pull request #759 from GDLMadushanka/master
...
Redirecting to respective analytics pages depending on the device type
2017-06-06 09:59:19 +05:30
GDLMadushanka
36bd1c5daf
Refactoring
2017-06-06 09:44:30 +05:30
Rasika Perera
8548e911aa
Added an error message when gpl siddhi extension is not configured
2017-06-06 06:18:27 +05:30
Rasika Perera
c7a751b1ef
Fixing location map height
2017-06-06 05:37:30 +05:30
Thomson Ignesious
0621579d25
case sensitiv
...
stmt = conn.prepareStatement(sql, new String[]{"ID"}) this line makes case sensitive issues, an exception saying 'ID' does not exist while using the postgreSQL.
2017-06-05 18:25:15 +05:30
Madawa Soysa
f9b759ddf7
Parameterizing the iot-api-config file
...
Fixes wso2/product-iots#449
2017-06-05 15:17:45 +05:30
Rasika Perera
ec343cef1a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
2017-06-05 10:26:10 +05:30
Rasika Perera
74709804f2
Fixing commons-collections.version issue
2017-06-05 10:22:29 +05:30
Rasika Perera
dfb0e154c6
Added cdmf core dependency
2017-06-05 10:21:19 +05:30
Rasika Perera
6a2785cc8d
Multitenancy added to event publisher
2017-06-05 10:18:31 +05:30
Rasika Perera
fb368caae4
Removed unused gson initization
2017-06-05 10:16:03 +05:30
Rasika Perera
9865a260d4
Publishing location operation response into iot location event stream
2017-06-05 10:12:22 +05:30
Rasika Perera
886eaec271
Geo service alerts history method added
2017-06-05 10:11:14 +05:30
Rasika Perera
2733197edc
PublishLocationOperationResponse config element added to cdm-config.xml
2017-06-05 10:10:29 +05:30
Rasika Perera
76f4457462
Changes to geo dashboard ui in /devicemgt
2017-06-05 10:08:34 +05:30
Rasika Perera
d37aafff48
iot location stream added for event publishing
2017-06-05 10:08:09 +05:30
