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 |
|
Ruwan
|
9be74f6d29
|
Merge pull request #775 from harshanL/master
Disabled java doc generation in build.
|
2017-06-14 15:28:38 +05:30 |
|
Harshan Liyanage
|
ba8965af7c
|
Disabled java doc generation in build.
|
2017-06-14 15:27:03 +05:30 |
|
Ayyoob Hamza
|
a2ac6fe4a5
|
Merge pull request #774 from harshanL/master
Added javadoc comments.
|
2017-06-14 15:10:00 +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
|
9bc23a927d
|
Fixed the mysql script for app management
|
2017-06-14 12:47:52 +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
|
23334f75c7
|
Merge pull request #772 from Vishanth/master
fixing sql queries to compare owner in lowercase
|
2017-06-13 17:20:36 +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 |
|