Geeth
63a7a2bb28
Merge pull request #813 from milanperera/iot-master
...
Fixed issue wso2/product-iots#427
2017-06-28 18:35:43 +05:30
Milan Perera
4994fddfd8
Fixed issue wso2/product-iots#427
2017-06-28 18:32:21 +05:30
WSO2 Builder
cb078fbb0f
[WSO2 Release] [Jenkins #2404 ] [Release 3.0.12] prepare for next development iteration
2017-06-28 18:26:18 +05:30
WSO2 Builder
8e874b2ef0
[WSO2 Release] [Jenkins #2404 ] [Release 3.0.12] prepare release v3.0.12
2017-06-28 18:26:05 +05:30
Milan Perera
c605ffbd58
Fixed issue wso2/product-iots#475
2017-06-28 17:56:50 +05:30
Milan Perera
a60566a417
Removed DCR dependancies
2017-06-28 12:19:09 +05:30
Milan Perera
72a19085ad
Removed DCR feature
2017-06-28 08:41:41 +05:30
Milan Perera
eb89aa4ff4
Removed DCR feature
2017-06-27 23:20:04 +05:30
WSO2 Builder
c03e1ec1d1
[WSO2 Release] [Jenkins #2401 ] [Release 3.0.11] prepare for next development iteration
2017-06-27 12:15:35 +05:30
WSO2 Builder
997affda65
[WSO2 Release] [Jenkins #2401 ] [Release 3.0.11] prepare release v3.0.11
2017-06-27 12:15:21 +05:30
Janak Amarasena
21a9df97bb
Add proper handling when invalid token is received
2017-06-26 18:37:01 +05:30
warunalakshitha
ad9ec1f994
Add multiple push notification support and transport config for features
2017-06-26 11:45:15 +05:30
WSO2 Builder
e23ef52e61
[maven-release-plugin]prepare for next development iteration
2017-06-23 20:27:17 +05:30
WSO2 Builder
c333f28461
[maven-release-plugin]prepare release v3.0.10
2017-06-23 20:27:03 +05:30
Madhawa Perera
25aaf92641
Merge pull request #810 from sinthuja/master
...
Updating source/target versions to jdk 1.8.
2017-06-23 18:12:45 +05:30
Madhawa Perera
6adc8e6aef
Merge pull request #809 from janakamarasena/high-priority-fixes-2
...
Fixes NPE when using Access Token grant handler
2017-06-23 18:00:42 +05:30
sinthuja
fce84b9942
Updating source/target versions to jdk 1.8.
2017-06-23 18:00:06 +05:30
Janak Amarasena
0f41dce394
Fixed spacing
2017-06-23 17:53:32 +05:30
Janak Amarasena
88bdad18b1
Fixes NPE
2017-06-23 17:50:42 +05:30
Harshan Liyanage
188c80f52a
Merge pull request #808 from hasuniea/master
...
Fixing issue wso2/product-iot#527
2017-06-23 17:49:23 +05:30
Hasunie
9206f74790
Fixing issue wso2/product-iot##527
2017-06-23 17:39:42 +05:30
Kamidu Sachith Punchihewa
e556193647
Merge pull request #807 from DimalChandrasiri/master
...
Fix for application listing app name clipping issue
2017-06-23 17:30:31 +05:30
WSO2 Builder
27e494f153
[WSO2 Release] [Jenkins #2393 ] [Release 3.0.9] prepare for next development iteration
2017-06-23 17:22:32 +05:30
WSO2 Builder
21ab65e6d5
[WSO2 Release] [Jenkins #2393 ] [Release 3.0.9] prepare release v3.0.9
2017-06-23 17:22:20 +05:30
Imesh Chandrasiri
930dccaa4d
fix for application listing app name clipping issue
2017-06-23 17:09:21 +05:30
Ayyoob Hamza
bd65b1d73b
Merge pull request #806 from rasika/master
...
Fixing android geo fencing ui
2017-06-23 16:48:52 +05:30
Rasika Perera
fcf41d6511
Reducing the map height
2017-06-23 16:43:13 +05:30
Rasika Perera
bfbaf00e34
Fixing android geo fencing ui
2017-06-23 16:37:22 +05:30
Rasika Perera
139bc99cc7
Adding error logs when unexpected error from gateway
2017-06-23 16:37:08 +05:30
lasantha
88328b6be3
Adding latest Font WSO2
2017-06-23 14:58:39 +05:30
WSO2 Builder
54d25522ba
[WSO2 Release] [Jenkins #2390 ] [Release 3.0.8] prepare for next development iteration
2017-06-22 20:09:55 +05:30
WSO2 Builder
69b168f3b2
[WSO2 Release] [Jenkins #2390 ] [Release 3.0.8] prepare release v3.0.8
2017-06-22 20:09:41 +05:30
Geeth
63c8e87d98
Merge pull request #803 from ayyoob/devicetype-3.1.0
...
Adding Device type API Implementation
2017-06-22 19:46:33 +05:30
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
Kamidu Sachith Punchihewa
f868fa2d35
Merge pull request #804 from DimalChandrasiri/master
...
Fix for removed device selection in Data Table
2017-06-22 17:13:59 +05:30
Imesh Chandrasiri
cba8f5243e
Fix for removed device selection in datatable
2017-06-22 17:07:59 +05:30
Kamidu Sachith Punchihewa
3c5e65c047
Merge pull request #802 from dunithd/master
...
Adding refresh button for the operations log tab
2017-06-22 17:00:22 +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
dunithd
b3642730ad
Adding refresh button for the operations log tab
2017-06-22 16:49:01 +05:30
inoshperera
ae8452adcb
Merge pull request #801 from geethkokila/master
...
Fixing the task for all the tenants
2017-06-22 15:56:08 +05:30
geethkokila
1655b512b0
Fixing formating issues
2017-06-22 15:55:22 +05:30
geethkokila
5f71313af1
Fixing formating issues
2017-06-22 15:53:11 +05:30
geethkokila
07357124b0
Fixing the task for all the tenants
2017-06-22 15:45:11 +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
Hasunie
b2c6bc5453
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-06-22 10:50:51 +05:30
ayyoob
9f4037b7e1
few changes to ui
2017-06-22 06:50:20 +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
Geeth
a47d2a6672
Merge pull request #797 from sinthuja/master
...
Fixing issues in IoT core with MSSQL.
2017-06-21 23:02:46 +05:30
Kamidu Sachith Punchihewa
a895c1f4dd
Merge pull request #795 from janakamarasena/high-priority-fixes-2
...
Added bottom margin to 'Show All Notifications' button
2017-06-21 19:34:50 +05:30
kamidu
525c0958d9
fixing the password reset issue
2017-06-21 18:53:56 +05:30
Janak Amarasena
db98663c78
Added bottom margin to Show All Notifications button
2017-06-21 18:04:11 +05:30
sinthuja
ee8f29503d
Merge branch 'wso2-master'
2017-06-21 16:31:06 +05:30
sinthuja
8197547383
Fixing MSSQL related issues, and dbscript issues.
2017-06-21 16:30:19 +05:30
Geeth
d6fcdf500b
Merge pull request #794 from milanperera/iot-master
...
Changing error logs to debug
2017-06-21 14:31:31 +05:30
Milan Perera
cda5a0b216
Changing error logs to debug
2017-06-21 13:10:24 +05:30
Imesh Chandrasiri
66d9ea4bde
Merge branch 'master' of https://github.com/DimalChandrasiri/carbon-device-mgt
2017-06-21 12:36:46 +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
Imesh Chandrasiri
1546411814
Fixed Multiple ajax calls when filtering
2017-06-20 20:25:57 +05:30
dunithd
d0058b982c
Adding new UX styles CSS
2017-06-20 19:40:58 +05:30
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
Chatura Dilan
10f1158c45
Refactor code
2017-06-20 15:21:50 +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
Chatura Dilan
d3f87a30ed
Refactor edit apps functionality
2017-06-19 12:58:09 +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
Chatura Dilan
58eab35123
Merge branch 'application-mgt' of github.com:wso2/carbon-device-mgt into application-mgt
2017-06-14 17:27:14 +05:30
Chatura Dilan
6d6aa50b2a
Added functionailty to update app
2017-06-14 17:27:01 +05:30
sinthuja
fe3325ebf2
Merge remote-tracking branch 'wso2/application-mgt' into wso2-application-mgt
...
# Conflicts:
# components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/PlatformDAO.java
# components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/platform/GenericPlatformDAOImpl.java
2017-06-14 16:13:38 +05:30
sinthuja
e5704ac05d
Using the platformManger service instead of using the DAO.
2017-06-14 16:10:54 +05:30
sinthuja
a7569456ce
fixing the build issue due to removing the method in platform manager.
2017-06-14 16:09:08 +05:30
sinthuja
59f43886cf
Adding the update platform API.
2017-06-14 16:07:16 +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
Chatura Dilan
d7b784b073
Removed published from platforms
2017-06-14 12:45:15 +05:30
Chatura Dilan
ac871fdbce
Fixed exception class to PlatformDAOException
2017-06-14 12:40:11 +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
Chatura Dilan
52b2739bee
Refactoring DAOs
2017-06-14 12:28:13 +05:30
Chatura Dilan
6a18d7ab4c
Fixed conflicts
2017-06-14 12:15:49 +05:30
Chatura Dilan
2b0ae8c5a4
Added creating app functionality
2017-06-14 11:59:06 +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
sinthuja
6020b3fb65
Adding platform manager first API.
2017-06-13 18:15:58 +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
sinthuja
fe26352ec9
Adding platform manager first API.
2017-06-13 13:55:04 +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
sinthuja
b183ec3e89
Merge remote-tracking branch 'wso2/application-mgt' into wso2-application-mgt
2017-06-09 19:04:11 +05:30
sinthuja
41def8fe76
Adding first cut of platform manager capabilities.
2017-06-09 19:04:02 +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
352c881c24
Refactor code
2017-06-07 17:22:31 +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
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
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
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
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
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
Chatura Dilan
b25f14668e
Fixed issue in Lifecycle class
2017-06-01 11:29:29 +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
Rasika Perera
5cb0f9bb94
Fixes to geo-fencing ui
2017-06-01 05:00:00 +05:30
sinthuja
8d6e4cfa01
Fixing issues in resolving the configuration resolving.
2017-05-31 18:01:07 +05:30
sinthuja
fd18ab711c
Fixing issues in resolving the configuration resolving.
2017-05-31 16:03:37 +05:30
sinthuja
242cf06f42
Refactoring the APP manager code, second phase.
2017-05-31 13:50:03 +05:30
Rasika Perera
ddfecba1a6
Added geo fencing unit
2017-05-31 10:58:51 +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
Rasika Perera
0a8929c7ee
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
2017-05-30 16:35:36 +05:30
sinthuja
810c0383a8
Fixing the compilation failure issues.
2017-05-30 12:41:23 +05:30
sinthuja
d882a05833
Reverting back to runtime exceptions.
2017-05-30 12:03:56 +05:30
sinthuja
dd6e70ce86
First cut of refactoring the code.
2017-05-30 11:44:24 +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
Chatura Dilan
9343032c88
Changes to App Management Externsions Framework
2017-05-29 18:35:37 +05:30
Rasika Perera
f864506f62
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
2017-05-29 13:09:21 +05:30
Rasika Perera
7b0295ff01
Added geo-fencing to the devicemgt app
2017-05-29 12:58:06 +05:30
Rasika Perera
ea3ed9c444
Added Geo Service into Device Mgt Core
2017-05-29 11:51:41 +05:30
ayyoob
f03155a702
fixed missing import package issue
2017-05-29 11:36:09 +05:30
Chatura Dilan
c89491b93e
Changes to schema
2017-05-29 10:22:17 +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
