Commit Graph

6972 Commits

Author SHA1 Message Date
WSO2 Builder
b885931c26 [WSO2 Release] [Jenkins #2874] [Release 3.0.210] prepare for next development iteration 2018-01-24 05:53:23 +00:00
WSO2 Builder
e1a5b3ec43 [WSO2 Release] [Jenkins #2874] [Release 3.0.210] prepare release v3.0.210 2018-01-24 05:53:08 +00:00
Rasika Perera
faeda50030
Merge pull request #1166 from wso2/rasika-patch-2
Update README.md
2018-01-24 11:04:44 +05:30
Ace
bc9450b7ff merging with upstream 2018-01-24 10:53:00 +05:30
Ace
327f49cfd9 Fix for https://github.com/wso2/product-iots/issues/1399 2018-01-24 10:52:33 +05:30
Rasika Perera
3f27032f64
Update README.md 2018-01-24 07:36:27 +05:30
Rasika Perera
ab352015b7 Fixes for the https://github.com/wso2/product-iots/issues/1624 2018-01-24 07:26:56 +05:30
Rasika Perera
de78869eea
Merge pull request #1144 from NishadiPrasangini/AppManager
App manager
2018-01-24 06:12:27 +05:30
Rasika Perera
8a09e44c3e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into fix-1624 2018-01-23 18:48:26 +05:30
WSO2 Builder
b428ecb931 [WSO2 Release] [Jenkins #2872] [Release 3.0.209] prepare for next development iteration 2018-01-23 13:16:30 +00:00
WSO2 Builder
091da0326d [WSO2 Release] [Jenkins #2872] [Release 3.0.209] prepare release v3.0.209 2018-01-23 13:16:15 +00:00
Rasika Perera
c5622c7b0b Fixing https://github.com/wso2/product-iots/issues/1624 2018-01-23 18:35:10 +05:30
WSO2 Builder
45f778d2e4 Merge commit '774c20a09a0bb12b11dbec7c4ec9d5fb491575e2' into 1d9c0cda-191e-4c45-9fd9-32a2aa0808a4 2018-01-23 13:03:19 +00:00
WSO2 Builder
774c20a09a [WSO2 Release] [Jenkins #2871] [Release 3.0.208] prepare for next development iteration 2018-01-23 12:48:12 +00:00
WSO2 Builder
4d35797a55 [WSO2 Release] [Jenkins #2871] [Release 3.0.208] prepare release v3.0.208 2018-01-23 12:47:55 +00:00
Rasika Perera
f3860e42f7 Fixing https://github.com/wso2/product-iots/issues/1624 2018-01-23 18:08:20 +05:30
Rasika Perera
a1c52599ba
Merge pull request #1164 from rasika/fix-1623
Removing DOM ID duplication in geo dashboard unit
2018-01-23 18:01:06 +05:30
Rasika Perera
5347930d95
Merge branch 'master' into fix-1623 2018-01-23 18:00:54 +05:30
Rasika Perera
a406dd0540
Merge pull request #1163 from rasika/fix-1611
Isolating Geo Location Enabling Configuration
2018-01-23 17:59:57 +05:30
Rasika Perera
c46a2037fe Fixing https://github.com/wso2/product-iots/issues/1611 2018-01-23 16:02:17 +05:30
Rasika Perera
68a5415e0b Fixing https://github.com/wso2/product-iots/issues/1623 2018-01-23 15:19:03 +05:30
Rasika Perera
3a9261536e Renamed isEnabled into Enabled for the consistency 2018-01-23 14:59:52 +05:30
Rasika Perera
08f4f04101 Fixing a typo 2018-01-23 14:39:33 +05:30
WSO2 Builder
8776317dfe [WSO2 Release] [Jenkins #2869] [Release 3.0.207] prepare for next development iteration 2018-01-22 11:14:43 +00:00
WSO2 Builder
21c406fe01 [WSO2 Release] [Jenkins #2869] [Release 3.0.207] prepare release v3.0.207 2018-01-22 11:14:29 +00:00
Geeth
aaa2e47cee
Merge pull request #1162 from geethkokila/master
Improvements to policy monitoring framework
2018-01-22 16:30:07 +05:30
Rasika Perera
394f45f4bd Fixing https://github.com/wso2/product-iots/issues/1611 2018-01-22 15:43:07 +05:30
geethkokila
ca92c5029f Changing the variable name 2018-01-22 15:25:40 +05:30
geethkokila
a0a2817730 Changing the variable name 2018-01-22 15:19:24 +05:30
geethkokila
7c4ca89beb Removing extra lines 2018-01-22 15:13:43 +05:30
geethkokila
5c2c7dfc2a Removing commented lines 2018-01-22 15:11:29 +05:30
geethkokila
8f1d15c690 Removing commented lines 2018-01-22 15:10:47 +05:30
geethkokila
03570f3ad7 Improvements to policy monitoring framework
This fixes the isseu where policy monitoring is configured per device type, they were not used. With this fix, main policy monitoring config is with cdm-config.xml and per device type can be enabled separately in the device type related xml file.
2018-01-22 14:39:29 +05:30
geethkokila
1a957666e3 Improvements to policy monitoring framework
This fixes the isseu where policy monitoring is configured per device type, they were not used. With this fix, main policy monitoring config is with cdm-config.xml and per device type can be enabled separately in the device type related xml file.
2018-01-22 14:39:16 +05:30
WSO2 Builder
d8caf3baea [WSO2 Release] [Jenkins #2867] [Release 3.0.206] prepare for next development iteration 2018-01-22 04:26:32 +00:00
WSO2 Builder
944d640d5f [WSO2 Release] [Jenkins #2867] [Release 3.0.206] prepare release v3.0.206 2018-01-22 04:26:17 +00:00
Madhawa Perera
e56fb5f4de
New Activity Info Provider API resource which accept an array of activity IDs to get activity information (#1161)
* New Activity Info Provider API resource which accept an array of activity IDs to get activity information

* Modifications to the new activity info provider api

* Add acceptable activity list count validation

* Modifications to the new activity provider API resource

* Added license header to the test class

* Modifications to the new activity provider api
2018-01-22 09:38:51 +05:30
nishadi
c50de8e2de Modified CommentsDAOmpl
Removed concatenation.
2018-01-18 16:33:04 +05:30
nishadi
a321bf934b Modified CommentsManagerImpl
Reformatted.
2018-01-18 16:26:40 +05:30
nishadi
40771cbfcd Modified CommentDAOImpl
String sql change int constant.
2018-01-18 16:21:18 +05:30
nishadi
8f8ec9a86a parameter in the consumes annotation changed to application/json 2018-01-18 15:56:38 +05:30
nishadi
eced883e7f Error response message changed. 2018-01-18 15:54:34 +05:30
nishadi
7242c63e60 CommentId changed into commentId 2018-01-18 14:54:15 +05:30
Madawa Soysa
0115ebc155 Adding travis build config 2018-01-18 14:50:47 +05:30
nishadi
27d3862ac8 CommentId changed into commentId 2018-01-18 14:42:40 +05:30
nishadi
3b86f8a443 CommentId changed into commentId 2018-01-18 14:16:48 +05:30
nishadi
da0b147050 modified commentsManagerImpl
Reformatted.
2018-01-18 13:31:21 +05:30
Madawa Soysa
08a091093f
Merge pull request #1160 from madawas/application-mgt-new
Adding travis build config
2018-01-18 11:42:00 +05:30
nishadi
f02a0b9e6c Modified pom.xml at org.wso2.carbon.device.application.mgt.common
Extra dependency to "org.wso2.carbon.device.application.mgt.core" is removed.
2018-01-18 11:32:32 +05:30
nishadi
4ea87284f2 Modified CommentAPIImpl
Reformatted
2018-01-18 11:17:05 +05:30