92 Commits

Author	SHA1	Message	Date
ayyoob	c718d723c0	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-08 01:20:28 +05:30
ayyoob	ea31637223	added scr reference to datasource for deployer and few fixes after the changes in the plugin	2017-01-08 01:19:03 +05:30
WSO2 Builder	5411d93103	[maven-release-plugin] prepare for next development iteration	2017-01-07 07:48:36 +00:00
WSO2 Builder	3ea83b925a	[maven-release-plugin] prepare release v2.0.6	2017-01-07 07:33:45 +00:00
ayyoob	20c3940ca4	made MonitoringTask to get config from device management service	2017-01-05 22:06:11 +05:30
ayyoob	09a148d476	disabled ui and capp deployers	2017-01-05 18:05:58 +05:30
ayyoob	b20a2e0997	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-05 17:51:34 +05:30
Maninda	0a6ef8daf7	Added some security fixes for issues reported by FindBugs	2017-01-05 14:51:13 +05:30
ayyoob	db2ddc7bed	policy manager refactored to support tenancy	2017-01-05 12:24:41 +05:30
ayyoob	9995f4293e	Default values set for push notification dynamic configuration	2017-01-05 12:24:04 +05:30
ayyoob	f511dc2bce	device type deployer for UI and plugin	2017-01-05 11:23:27 +05:30
WSO2 Builder	6aea6195e9	[maven-release-plugin] prepare for next development iteration	2016-12-23 19:20:14 +00:00
WSO2 Builder	3db5b289ac	[maven-release-plugin] prepare release v2.0.5	2016-12-23 19:18:26 +00:00
WSO2 Builder	ed47094964	[maven-release-plugin] prepare for next development iteration	2016-12-23 07:05:25 +00:00
WSO2 Builder	8d409a7248	[maven-release-plugin] prepare release v2.0.4	2016-12-23 07:00:40 +00:00
Rasika Perera	1465c56822	Revert "[WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4" ... This reverts commit f9b6939cb7.	2016-12-19 12:39:56 +05:30
WSO2 Builder	f9b6939cb7	[WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4	2016-12-19 09:06:04 +05:30
Rasika Perera	42930fe8c4	Revert "[WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4" ... This reverts commit 78b9052c37.	2016-12-19 08:45:19 +05:30
WSO2 Builder	78b9052c37	[WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4	2016-12-16 17:03:06 +05:30
Vishanth	1714328db0	datasource access for multi tenancy	2016-12-15 10:32:26 +05:30
WSO2 Builder	a59edee410	[maven-release-plugin] prepare for next development iteration	2016-12-08 14:39:00 +00:00
WSO2 Builder	8f9b21b41b	[maven-release-plugin] prepare release v2.0.3	2016-12-08 14:37:11 +00:00
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