dunithd
c832f1b5a9
Applying new UX design for device details default unit
2017-06-20 19:39:52 +05:30
ayyoob
3224f3a50c
few changes in dbscript
2017-06-20 19:33:24 +05:30
Megala Uthayakumar
7431ed4997
Merge pull request #791 from sinthuja/master
...
Fixing mssql related issue.
2017-06-20 19:03:44 +05:30
sinthuja
4bfd35cc74
Fixing issue in mssql database issue in processor.
2017-06-20 18:54:36 +05:30
sinthuja
5570349cd1
Reverting back the other databases to use the arrays.
2017-06-20 18:05:39 +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
Geeth
c7a8f83f54
Merge pull request #789 from harshanL/master
...
Updated title bar app name to IoT Server.
2017-06-20 17:37:56 +05:30
Harshan Liyanage
eebbcbb6fa
Merge pull request #782 from janakamarasena/high-priority-fixes
...
UI fixes
2017-06-20 17:04:03 +05:30
sinthuja
4018d582ed
Adding comments to the batch size config.
2017-06-20 16:17:07 +05:30
sinthuja
f2ea96efde
Reverting the changes done to GenericFeatureDAOImpl.
2017-06-20 16:16:10 +05:30
sinthuja
ce5ca09e51
Adding oracle server specific impl.
2017-06-20 16:15:12 +05:30
sinthuja
f59202c0c3
Reverting back to the debug logs.
2017-06-20 13:46:39 +05:30
sinthuja
ade596d3c4
Merging the AS clause removal queries with generic DAO from oracle.
2017-06-20 13:17:03 +05:30
sinthuja
9398e7ee0b
Merge branch 'wso2-master'
...
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractGroupDAOImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/OperationMappingDAOImpl.java
2017-06-19 23:10:15 +05:30
sinthuja
124c0b4cf8
Fixing issues related to oracle database.
2017-06-19 23:05:05 +05:30
Hasunie
19495321d2
removing unnecessary lines
2017-06-19 19:23:01 +05:30
Hasunie
3333ed0381
Fixing permission issue which resolves wso2/product-iots#430
2017-06-19 19:18:34 +05:30
Harshan Liyanage
50e82eb80d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-06-19 17:34:45 +05:30
Harshan Liyanage
fecc5e1b72
Changed devicemgt app name to IoT Server.
2017-06-19 17:33:43 +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
Harshan Liyanage
b8f085da20
Added null checks for device cache in-case cache is disabled.
2017-06-19 16:58:42 +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
inoshperera
88054f9075
removing non-compliance action.
2017-06-19 12:04:59 +05:30
geethkokila
0eca5a0152
Fixing the build failure
2017-06-19 11:44:47 +05:30
ayyoob
6dffac4191
fixes in ui
2017-06-18 16:41:38 +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
Janak Amarasena
3f17e66e8c
UI fixes
2017-06-16 16:51:49 +05:30
Harshan Liyanage
d8b756df3d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-06-16 16:48:30 +05:30
Harshan Liyanage
8b9420766f
Fixed SQL syntax issue in DeviceStatusMonitoring Task when running on PostgreSQL.
2017-06-16 16:47:34 +05:30
Harshan Liyanage
51c18d2108
Added pagination support for group-management for major db engines.
2017-06-16 16:46:30 +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
Madawa Soysa
98e8dfea68
Merge pull request #781 from inoshperera/master
...
fixing the agent unable to enroll issue
2017-06-16 15:29:22 +05:30
inoshperera
58b2bf8b3c
fixing the agent unable to enroll issue
2017-06-16 15:23:41 +05:30
Rasika Perera
a5c18b3c26
Geo Fencing UI fixes
2017-06-16 14:42:05 +05:30
madhawap
648659a781
Sets values taken from system varibales to iot-api-config.xml
...
iot-api-config.xml consists with system varibales like iot.core.host, iot.keymanager.host etc. But values set to those varibales were not pass into these places. This commit fixes that
2017-06-16 13:16:29 +05:30
madhawap
a115cff4db
reformatting code
2017-06-16 13:16:29 +05:30
Rasika Perera
d3f24bb8ba
Making alert danger into alert info in stationary alerts
2017-06-16 12:48:03 +05:30
Rasika Perera
c8d41c7b3e
Few more improvements into geo-dashboard
2017-06-16 12:45:29 +05:30
Rasika Perera
3fd2c6b705
Adding deploy geo analytics button into platform configuration
2017-06-16 12:30:24 +05:30
sinthuja
1c13269fc8
Fixing https://github.com/wso2/product-iots/issues/495 .
2017-06-16 11:50:54 +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
Rasika Perera
d0a1132060
Improving geo fence ui
2017-06-16 10:10:57 +05:30
Ayyoob Hamza
0551598988
Merge pull request #779 from janakamarasena/oauth-token-grant-refractor
...
Access token grant handler
2017-06-16 06:52:36 +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
Ruwan
5d4c85b61e
Merge pull request #778 from harshanL/master
...
Code refactored.
2017-06-15 15:20:37 +05:30
Janak Amarasena
b2bdc0b6c8
Add token validation classes to the same bundle
2017-06-15 15:04:59 +05:30
Harshan Liyanage
de9beb1f5b
Code refatcored.
2017-06-15 14:49:40 +05:30
inoshperera
d63ef44e7b
Merge pull request #777 from harshanL/master
...
Fixed wso2/product-iots#473
2017-06-15 12:03:01 +05:30
Harshan Liyanage
3857be50b9
Fixed wso2/product-iots#473
2017-06-15 11:58:22 +05:30
Ruwan
477608613e
Merge pull request #776 from rasika/master
...
Fixing https://github.com/wso2/product-iots/issues/431
2017-06-15 11:31:19 +05:30
Rasika Perera
61c4db07a3
Fixing https://github.com/wso2/product-iots/issues/431
2017-06-15 11:27:37 +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
Harshan Liyanage
9e24338660
Added javadoc comments.
2017-06-14 14:55:25 +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
Chatura Dilan
38b7689e28
Merge pull request #773 from harshanL/master
...
Fixed java-doc comments issues and added comments to the configs.
2017-06-14 12:35:39 +05:30
Harshan Liyanage
b510a422b4
Fixed java-doc comments issues and added comments to the configs.
2017-06-14 12:28:16 +05:30
Geeth
115ccb739a
Merge pull request #765 from harshanL/master
...
Added comments to the device status configs.
2017-06-14 11:42:21 +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
Rasika Perera
68d9b2d310
Adding focus on geo map
2017-06-14 07:48:57 +05:30
Rasika Perera
10c8bf7f42
Capilizing notification title
2017-06-14 07:47:01 +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
Harshan Liyanage
43ba1e1b43
Added Device-Cache for caching device objects which resolves harshanl/product-iots#1005
2017-06-13 17:08:26 +05:30
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
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
