ayyoob
80cc690a42
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
8 years ago
WSO2 Builder
68cb8d3f81
[WSO2 Release] [Jenkins #2380 ] [Release 3.0.7] prepare for next development iteration
8 years ago
WSO2 Builder
d0f52c48ef
[WSO2 Release] [Jenkins #2380 ] [Release 3.0.7] prepare release v3.0.7
8 years ago
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
8 years ago
Imesh Chandrasiri
1546411814
Fixed Multiple ajax calls when filtering
8 years ago
dunithd
d0058b982c
Adding new UX styles CSS
8 years ago
dunithd
c832f1b5a9
Applying new UX design for device details default unit
8 years ago
ayyoob
3224f3a50c
few changes in dbscript
8 years ago
Megala Uthayakumar
7431ed4997
Merge pull request #791 from sinthuja/master
...
Fixing mssql related issue.
8 years ago
sinthuja
4bfd35cc74
Fixing issue in mssql database issue in processor.
8 years ago
sinthuja
5570349cd1
Reverting back the other databases to use the arrays.
8 years ago
WSO2 Builder
2896b55f5e
[WSO2 Release] [Jenkins #2378 ] [Release 3.0.6] prepare for next development iteration
8 years ago
WSO2 Builder
bdb57383b1
[WSO2 Release] [Jenkins #2378 ] [Release 3.0.6] prepare release v3.0.6
8 years ago
dunithd
4cf3e2d421
Adding an API method to retrieve an activity by it's ID and a device ID
8 years ago
Geeth
c7a8f83f54
Merge pull request #789 from harshanL/master
...
Updated title bar app name to IoT Server.
8 years ago
Harshan Liyanage
eebbcbb6fa
Merge pull request #782 from janakamarasena/high-priority-fixes
...
UI fixes
8 years ago
sinthuja
4018d582ed
Adding comments to the batch size config.
8 years ago
sinthuja
f2ea96efde
Reverting the changes done to GenericFeatureDAOImpl.
8 years ago
sinthuja
ce5ca09e51
Adding oracle server specific impl.
8 years ago
sinthuja
f59202c0c3
Reverting back to the debug logs.
8 years ago
sinthuja
ade596d3c4
Merging the AS clause removal queries with generic DAO from oracle.
8 years ago
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
8 years ago
sinthuja
124c0b4cf8
Fixing issues related to oracle database.
8 years ago
Hasunie
19495321d2
removing unnecessary lines
8 years ago
Hasunie
3333ed0381
Fixing permission issue which resolves wso2/product-iots#430
8 years ago
Harshan Liyanage
50e82eb80d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Harshan Liyanage
fecc5e1b72
Changed devicemgt app name to IoT Server.
8 years ago
WSO2 Builder
8badc2bc37
[WSO2 Release] [Jenkins #2375 ] [Release 3.0.5] prepare for next development iteration
8 years ago
WSO2 Builder
43182aede9
[WSO2 Release] [Jenkins #2375 ] [Release 3.0.5] prepare release v3.0.5
8 years ago
Harshan Liyanage
b8f085da20
Added null checks for device cache in-case cache is disabled.
8 years ago
WSO2 Builder
f70535ed20
[WSO2 Release] [Jenkins #2373 ] [Release 3.0.4] prepare for next development iteration
8 years ago
WSO2 Builder
c3d154ee65
[WSO2 Release] [Jenkins #2373 ] [Release 3.0.4] prepare release v3.0.4
8 years ago
Harshan Liyanage
a21c374b00
Code refactoring.
8 years ago
Harshan Liyanage
074ceeb0c7
Merged with master
8 years ago
Harshan Liyanage
967efa1fee
Fixed user enrolled device showing problem which resolves wso2/product-iots#406
8 years ago
inoshperera
88054f9075
removing non-compliance action.
8 years ago
geethkokila
0eca5a0152
Fixing the build failure
8 years ago
ayyoob
6dffac4191
fixes in ui
8 years ago
ayyoob
3b7d4d8966
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
8 years ago
ayyoob
ca33f035df
merge ui fixes
8 years ago
Ayyoob Hamza
2875fb2ca0
Merge pull request #755 from rasika/geo-fencing
...
Added Geo Service into Device Mgt Core
8 years ago
WSO2 Builder
e924a86d73
[WSO2 Release] [Jenkins #2368 ] [Release 3.0.3] prepare for next development iteration
8 years ago
WSO2 Builder
b35aaab992
[WSO2 Release] [Jenkins #2368 ] [Release 3.0.3] prepare release v3.0.3
8 years ago
Janak Amarasena
3f17e66e8c
UI fixes
8 years ago
Harshan Liyanage
d8b756df3d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Harshan Liyanage
8b9420766f
Fixed SQL syntax issue in DeviceStatusMonitoring Task when running on PostgreSQL.
8 years ago
Harshan Liyanage
51c18d2108
Added pagination support for group-management for major db engines.
8 years ago
Rasika Perera
8da1f62cd9
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
8 years ago
Madawa Soysa
98e8dfea68
Merge pull request #781 from inoshperera/master
...
fixing the agent unable to enroll issue
8 years ago
inoshperera
58b2bf8b3c
fixing the agent unable to enroll issue
8 years ago
Rasika Perera
a5c18b3c26
Geo Fencing UI fixes
8 years ago
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
8 years ago
madhawap
a115cff4db
reformatting code
8 years ago
Rasika Perera
d3f24bb8ba
Making alert danger into alert info in stationary alerts
8 years ago
Rasika Perera
c8d41c7b3e
Few more improvements into geo-dashboard
8 years ago
Rasika Perera
3fd2c6b705
Adding deploy geo analytics button into platform configuration
8 years ago
sinthuja
1c13269fc8
Fixing https://github.com/wso2/product-iots/issues/495 .
8 years ago
WSO2 Builder
2b76317f40
[WSO2 Release] [Jenkins #2366 ] [Release 3.0.2] prepare for next development iteration
8 years ago
WSO2 Builder
02bc10e6d2
[WSO2 Release] [Jenkins #2366 ] [Release 3.0.2] prepare release v3.0.2
8 years ago
Rasika Perera
d0a1132060
Improving geo fence ui
8 years ago
Ayyoob Hamza
0551598988
Merge pull request #779 from janakamarasena/oauth-token-grant-refractor
...
Access token grant handler
8 years ago
ayyoob
f47d0deb1a
few changes after testing.
8 years ago
WSO2 Builder
1e58f762da
[WSO2 Release] [Jenkins #2365 ] [Release 3.0.1] prepare for next development iteration
8 years ago
WSO2 Builder
bae931f3c5
[WSO2 Release] [Jenkins #2365 ] [Release 3.0.1] prepare release v3.0.1
8 years ago
Ruwan
5d4c85b61e
Merge pull request #778 from harshanL/master
...
Code refactored.
8 years ago
Janak Amarasena
b2bdc0b6c8
Add token validation classes to the same bundle
8 years ago
Harshan Liyanage
de9beb1f5b
Code refatcored.
8 years ago
inoshperera
d63ef44e7b
Merge pull request #777 from harshanL/master
...
Fixed wso2/product-iots#473
8 years ago
Harshan Liyanage
3857be50b9
Fixed wso2/product-iots#473
8 years ago
Ruwan
477608613e
Merge pull request #776 from rasika/master
...
Fixing https://github.com/wso2/product-iots/issues/431
8 years ago
Rasika Perera
61c4db07a3
Fixing https://github.com/wso2/product-iots/issues/431
8 years ago
ayyoob
0d08c42f5e
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
8 years ago
WSO2 Builder
69d2cff7bd
[WSO2 Release] [Jenkins #2363 ] [Release 3.0.0] prepare for next development iteration
8 years ago
WSO2 Builder
3795011895
[WSO2 Release] [Jenkins #2363 ] [Release 3.0.0] prepare release v3.0.0
8 years ago
Harshan Liyanage
9e24338660
Added javadoc comments.
8 years ago
ayyoob
07bdd5cb6c
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
8 years ago
ayyoob
da68f8fac1
fixed on config operation flow
8 years ago
Chatura Dilan
38b7689e28
Merge pull request #773 from harshanL/master
...
Fixed java-doc comments issues and added comments to the configs.
8 years ago
Harshan Liyanage
b510a422b4
Fixed java-doc comments issues and added comments to the configs.
8 years ago
Geeth
115ccb739a
Merge pull request #765 from harshanL/master
...
Added comments to the device status configs.
8 years ago
Rasika Perera
798e551673
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
8 years ago
Rasika Perera
68d9b2d310
Adding focus on geo map
8 years ago
Rasika Perera
10c8bf7f42
Capilizing notification title
8 years ago
WSO2 Builder
16420433b5
[WSO2 Release] [Jenkins #2352 ] [Release 2.0.75] prepare for next development iteration
8 years ago
WSO2 Builder
5c06b9dcb2
[WSO2 Release] [Jenkins #2352 ] [Release 2.0.75] prepare release v2.0.75
8 years ago
Harshan Liyanage
43ba1e1b43
Added Device-Cache for caching device objects which resolves harshanl/product-iots#1005
8 years ago
Vishanth
7da1067d68
fixing sql queries to compare owner in lowercase
8 years ago
Rasika Perera
4796f5934f
Fixed geo alerts notifications
8 years ago
Rasika Perera
73ab6f28c1
Fixed sidebar notifications
8 years ago
Rasika Perera
6470e8e3d2
Fixed sidebar notifications
8 years ago
Rasika Perera
c970167299
UI fixes for geo fencing
8 years ago
Rasika Perera
ce6ab9b354
Refactoring "executionPlanType" -> "alertType"
8 years ago
Rasika Perera
e1c5c72b1b
Adding geo fence exit alerts ui
8 years ago
Rasika Perera
6d02075a99
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
8 years ago
ayyoob
22a4716443
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
8 years ago
ayyoob
c93410eb92
added few changes after review
8 years ago
Harshan Liyanage
951cd7b001
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
WSO2 Builder
8927158086
[WSO2 Release] [Jenkins #2346 ] [Release 2.0.74] prepare for next development iteration
8 years ago
WSO2 Builder
28423c45bc
[WSO2 Release] [Jenkins #2346 ] [Release 2.0.74] prepare release v2.0.74
8 years ago
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
8 years ago
ayyoob
7ab52af66e
add http pushnotification
8 years ago
Harshan Liyanage
f215b5ee44
Added comments to the device status configs.
8 years ago
Chatura Dilan
f2db2609bd
Merge pull request #763 from janakamarasena/ouath-token-grant-v2
...
New OAuth grant type
8 years ago
Harshan Liyanage
a30982207b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Harshan Liyanage
3766ba0349
Refactored DeviceMgmtProviderService to fetch only the required data which resolves product-iots#991
8 years ago
Janak Amarasena
bdaa4088a3
Resolve reference errors
8 years ago
Janak Amarasena
848c219efe
Add scope validator
8 years ago
Janak Amarasena
a9a246c2c4
Add new oauth grant type
8 years ago
WSO2 Builder
e3dfbdfdbd
[WSO2 Release] [Jenkins #2342 ] [Release 2.0.73] prepare for next development iteration
8 years ago
WSO2 Builder
598332b640
[WSO2 Release] [Jenkins #2342 ] [Release 2.0.73] prepare release v2.0.73
8 years ago
inoshperera
9f9208cebc
adding default values for timestamp
8 years ago
Rasika Perera
05b11a5099
Adding Exit Alerts feature
8 years ago
Rasika Perera
4f447305c9
Fixing minor issue in viewing geo fence
8 years ago
WSO2 Builder
73fa026eeb
[WSO2 Release] [Jenkins #2340 ] [Release 2.0.72] prepare for next development iteration
8 years ago
WSO2 Builder
2415762ccb
[WSO2 Release] [Jenkins #2340 ] [Release 2.0.72] prepare release v2.0.72
8 years ago
ayyoob
f3393080ba
fixed few issues after testing
8 years ago
GDLMadushanka
36bd1c5daf
Refactoring
8 years ago
Rasika Perera
8548e911aa
Added an error message when gpl siddhi extension is not configured
8 years ago
Rasika Perera
c7a751b1ef
Fixing location map height
8 years ago
Rasika Perera
ec343cef1a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing
8 years ago
Rasika Perera
dfb0e154c6
Added cdmf core dependency
8 years ago
Rasika Perera
6a2785cc8d
Multitenancy added to event publisher
8 years ago
Rasika Perera
fb368caae4
Removed unused gson initization
8 years ago
Rasika Perera
9865a260d4
Publishing location operation response into iot location event stream
8 years ago
Rasika Perera
886eaec271
Geo service alerts history method added
8 years ago
Rasika Perera
2733197edc
PublishLocationOperationResponse config element added to cdm-config.xml
8 years ago
Rasika Perera
76f4457462
Changes to geo dashboard ui in /devicemgt
8 years ago
GDLMadushanka
85d07dc9cb
Redirecting to respective analytics pages depending on the device type
8 years ago
ayyoob
194e4d99b5
added policy compliance support
8 years ago
ayyoob
5b46dc03a5
few fixes on event reciever definition
8 years ago
ayyoob
7cba43ccbb
few changes after testing HTTP and MQTT flow
8 years ago
ayyoob
a7ebc96cb7
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
8 years ago
ayyoob
a1b20f1663
changed response payload definition for pull notification
8 years ago
WSO2 Builder
39a7037821
[WSO2 Release] [Jenkins #2334 ] [Release 2.0.71] prepare for next development iteration
8 years ago
WSO2 Builder
22782ec125
[WSO2 Release] [Jenkins #2334 ] [Release 2.0.71] prepare release v2.0.71
8 years ago
Harshan Liyanage
9871122c0a
Code refactoring of device-status-task which Resolves harshanl/product-iots#518
8 years ago
Harshan Liyanage
52bbdfcd78
Code refactoring of device-status-task which Resolves harshanl/product-iots#518
8 years ago
Harshan Liyanage
fda9410a2a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Harshan Liyanage
d3cb7ba70b
Changed the device-status-task to use optimized queries which Resolves harshanl/product-iots#518
8 years ago
ayyoob
c46cbfafe5
Merge branch 'devicetype-3.1.0' of https://github.com/ayyoob/carbon-device-mgt into devicetype-3.1.0
8 years ago
ayyoob
4dc0f69e28
updated version
8 years ago
ayyoob
04b8b74e4f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
8 years ago
ayyoob
a0d7518cbe
Implemented Pull Notification Support
8 years ago
ayyoob
8a56161a43
Implemented Pull Notification Support
8 years ago
WSO2 Builder
c7fd70145d
[WSO2 Release] [Jenkins #2331 ] [Release 2.0.70] prepare for next development iteration
8 years ago
WSO2 Builder
0c9d104401
[WSO2 Release] [Jenkins #2331 ] [Release 2.0.70] prepare release v2.0.70
8 years ago
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
8 years ago
Rasika Perera
5cb0f9bb94
Fixes to geo-fencing ui
8 years ago
Rasika Perera
ddfecba1a6
Added geo fencing unit
8 years ago
Malintha Fernando
07f2cb608b
Fix : Store device type names as it is
8 years ago