Commit Graph

70 Commits

Author SHA1 Message Date
charitha
78dfddbbed Merge branch 'merge-master' of https://github.com/geethkokila/carbon-device-mgt into release-2.0.x 2016-12-08 18:58:47 +05:30
madhawap
b889f6e384 adding separate tasks for each device type 2016-12-08 17:21:07 +05:30
geethkokila
a0615d3d63 Merge branch 'release-2.0.x' into merge-master 2016-12-08 12:36:53 +05:30
geethkokila
d911281ad1 Merging master branch with release-2.0.x 2016-12-08 12:34:50 +05:30
Ruwan
f2f304ccc4 Merge pull request #470 from rasika/release-2.0.x
Fixing device identifier is null and Throwing exception when device not found
2016-12-07 12:15:17 +05:30
Rasika Perera
4e0730f50c Fixing device identifier is null issue 2016-12-07 12:06:22 +05:30
Ace
8cc0ba56c1 Adding changes to descriptor 2016-12-06 13:29:59 +05:30
Ace
7eaee141e0 Adding content-type to descriptor 2016-12-05 10:34:11 +05:30
WSO2 Builder
228b24ca79 [maven-release-plugin] prepare for next development iteration 2016-12-01 12:14:01 +00:00
WSO2 Builder
5dbb258f55 [maven-release-plugin] prepare release v2.0.2 2016-12-01 12:10:10 +00:00
charitha
1c8e4b8de7 Merge branch 'portal' of https://github.com/Megala21/carbon-device-mgt into release-2.0.x
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
2016-12-01 17:12:10 +05:30
madhawap
2b00645779 refactored code 2016-12-01 16:31:27 +05:30
madhawap
bec4ae681d Seperate out task operations 2016-12-01 15:28:22 +05:30
Hasunie
529bde822c fixing property string mapper issue 2016-12-01 09:12:33 +05:30
Hasunie
1b5bae3e46 adding required authorization property 2016-12-01 08:59:19 +05:30
WSO2 Builder
8431b30ddc [maven-release-plugin] prepare for next development iteration 2016-11-25 08:06:30 +00:00
WSO2 Builder
ae2e283f14 [maven-release-plugin] prepare release v2.0.1 2016-11-25 07:43:34 +00:00
ayyoob
e3849ef21e removed feature lifecycle implementation 2016-11-21 20:49:27 +05:30
ayyoob
8a6af051dc Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0 2016-11-17 18:37:38 +05:30
ayyoob
a0c8aeb159 few changes after testing feature manager implementation 2016-11-17 18:35:40 +05:30
WSO2 Builder
19c1b3566d [maven-release-plugin] prepare for next development iteration 2016-11-16 12:18:48 +00:00
WSO2 Builder
cff6e242c8 [maven-release-plugin] prepare release v2.0.0 2016-11-16 12:16:25 +00:00
charitha
a6064d2561 Update component versions for IoTS-1.0.0 release 2016-11-16 13:32:13 +05:30
ayyoob
415fae8007 fixed update issue 2016-11-08 23:40:28 +05:30
ayyoob
0f66c90660 preload db queries 2016-11-07 01:14:22 +05:30
ayyoob
44ac6b13b5 changes in UI after refactoring 2016-11-07 00:51:08 +05:30
ayyoob
4292442aa5 refactored device type deployer 2016-11-06 17:46:02 +05:30
Ace
5eaca0b1b1 merging with upstream 2016-11-04 20:09:01 +05:30
Ace
2aa1c98d0b bringing common features to cdmf 2016-11-04 19:12:06 +05:30
ayyoob
202e0d5619 merged with origin 2016-11-02 09:44:49 +05:30
ayyoob
33bb9b5a14 merged with IoTS-1.0.0 branch 2016-11-02 06:51:28 +05:30
WSO2 Builder
9517a3d30f [maven-release-plugin] prepare for next development iteration 2016-10-31 10:34:22 +00:00
WSO2 Builder
a8568299b9 [maven-release-plugin] prepare release v1.2.6 2016-10-31 10:32:11 +00:00
ayyoob
8293ed43ae added missing imports 2016-10-24 02:17:20 +05:30
ayyoob
16f6a62dca refactored DAO handler 2016-10-23 17:37:27 +05:30
ayyoob
fbfb86c53e refactored DAO handler 2016-10-23 15:45:29 +05:30
ayyoob
d17241e51e added comments and license 2016-10-23 14:18:15 +05:30
ayyoob
c48f879205 added XmlAccessorType to root pom 2016-10-23 01:24:33 +05:30
ayyoob
e3ef66aa1a added deployer feature 2016-10-22 22:36:38 +05:30
ayyoob
eeea1c372f updated configs and Dao 2016-10-22 22:22:34 +05:30
ayyoob
d6090dd812 added device type deployer initial commit 2016-10-22 01:37:01 +05:30
WSO2 Builder
27a2c9b979 [maven-release-plugin] prepare for next development iteration 2016-10-18 12:17:27 +00:00
WSO2 Builder
eae935f91c [maven-release-plugin] prepare release v1.2.5 2016-10-18 12:09:16 +00:00
WSO2 Builder
6a55e1be83 [maven-release-plugin] prepare for next development iteration 2016-10-17 14:15:22 +00:00
WSO2 Builder
11c2e59f61 [maven-release-plugin] prepare release v1.2.4 2016-10-17 14:13:25 +00:00
Chatura Dilan Perera
c16cc4cae1 [maven-release-plugin] prepare for next development iteration 2016-09-29 20:33:07 +05:30
Chatura Dilan Perera
ed4bca7032 [maven-release-plugin] prepare release v1.2.2 2016-09-29 20:32:59 +05:30
Rasika Perera
5c8c28d28c Merge pull request #1 from warunalakshitha/master
upgrade product iot to carbon 4.4.9
2016-09-29 11:24:05 +05:30
Rasika Perera
86a45fec2e Fixes to mqtt notification strategy when message body is null 2016-09-26 14:57:10 +05:30
Ace
154a6082ce Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
# Conflicts:
#	features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
2016-09-22 19:08:21 +05:30