346 Commits

Author	SHA1	Message	Date
prabathabey	d65174d026	making the certificate management war adhere the REST API guidelines	2016-05-31 16:27:35 +05:30
hasuniea	57d445237a	add certificateMgtService	2016-05-31 12:48:26 +05:30
prabathabey	13db7c906f	changing the webapp name of cdmf admin APIs	2016-05-30 12:08:22 +05:30
prabathabey	6e5148a374	Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services	2016-05-30 08:21:59 +05:30
dilanua	f4f47cbfdd	Changing view names to fix oracle naming issues in dashboard analytics feature	2016-05-28 00:41:21 +05:30
Madhawa Perera	4b128a6ebd	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-27 22:15:53 +05:30
Madhawa Perera	d805245ffc	added username field to the device certificate db and related changes	2016-05-27 22:15:21 +05:30
Hasunie	981db24ca8	Merge pull request #279 from hasuniea/master ... add certificate feature	2016-05-27 19:48:49 +05:30
hasuniea	271170c26e	refactored cert feature	2016-05-27 18:42:24 +05:30
prabathabey	32cb32b706	modifying the name of the device management admin api war	2016-05-27 12:28:48 +05:30
prabathabey	30f6fc53b5	Merging the latest changes introduced in master	2016-05-27 11:44:58 +05:30
prabathabey	7e3865a233	Fixing admin webapp path in p2.inf	2016-05-27 10:55:47 +05:30
geethkokila	f29cacffff	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-26 18:23:40 +05:30
geethkokila	6365e5a8a9	Fixing activity the activity id	2016-05-26 18:23:29 +05:30
hasuniea	ad7fa09e32	add certificate service	2016-05-26 18:11:07 +05:30
Dileesha Rajapakse	8821227de2	Fixed Oracle driver related syntax issues and table names	2016-05-26 17:15:35 +05:30
hasuniea	c281b6a6f0	SCEP csr sign feature	2016-05-25 18:14:28 +05:30
hasuniea	7281abf876	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-25 18:11:29 +05:30
GPrathap	c9c0a75430	added a bundleDef :net.minidev:json-smart	2016-05-25 14:39:59 +05:30
hasuniea	ad1a4cbd6a	fixed code conflicts	2016-05-25 13:51:46 +05:30
hasuniea	e2e517d7ca	SCEP endpoint	2016-05-25 13:44:42 +05:30
mharindu	3e291c5b13	[maven-release-plugin] prepare for next development iteration	2016-05-20 16:43:16 +05:30
mharindu	9549ac446b	[maven-release-plugin] prepare release v1.1.0	2016-05-20 16:43:02 +05:30
mharindu	968cb00f35	Fixed conflicts and merged	2016-05-19 00:42:14 +05:30
prabathabey	a375252a94	Adding pluggable push notification framework	2016-05-19 00:20:45 +05:30
mharindu	bca1b4b059	Fixed conflicts	2016-05-18 22:01:38 +05:30
dilanua	7051af8d80	Adding relevant contextual names for database view names in dashboard analytics feature	2016-05-18 18:48:43 +05:30
mharindu	d08f691886	Fixed issue in webapp-publisher-config.xml	2016-05-17 12:30:05 +05:30
mharindu	5ccc480ddb	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim	2016-05-17 12:25:57 +05:30
mharindu	16a8f61f79	Refactored jwt authenticator	2016-05-17 08:48:55 +05:30
charitha	25cff47335	Moved email templates to emm base plugin as they are related to emm	2016-05-16 21:11:31 +05:30
mharindu	9a4b904702	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim	2016-05-16 11:55:35 +05:30
mharindu	f2ac5c5cad	Implemented extended scope validator and improved webapp publisher to support Synapse	2016-05-16 11:46:30 +05:30
charitha	0a838923cb	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... # Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/api/Group.java	2016-05-13 12:43:53 +05:30
geethkokila	362cf40d85	Fixing the operation activity id issues	2016-05-13 00:25:13 +05:30
mharindu	fd39b31369	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-12 22:00:24 +05:30
mharindu	1f21144668	Renamed EMM permission to CDMF	2016-05-12 22:00:15 +05:30
ayyoob	42dde2c8eb	updated property	2016-05-12 19:17:31 +05:30
ayyoob	df473e4284	revert back	2016-05-12 13:49:32 +05:30
ayyoob	34f1f4dfe2	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport	2016-05-12 13:41:08 +05:30
charitha	18957b0110	Add required jagerry modules for the app	2016-05-11 19:30:55 +05:30
dilanua	e151bca0c7	Adding device-identification attribute for database views in dashboard analytics feature	2016-05-11 16:25:00 +05:30
dilanua	754195bee6	Adding mssql support to dashboard analytics feature	2016-05-11 12:01:39 +05:30
Dilan U. Ariyaratne	c9eed309aa	Merge pull request #238 from dilee/master ... Fixed errors in MSSQL DB script	2016-05-11 11:08:14 +05:30
Dileesha Rajapakse	e055519d4c	Fixed errors in MSSQL DB script	2016-05-11 11:02:43 +05:30
mharindu	b58e2b13c6	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-11 10:50:46 +05:30
mharindu	5ad8d2938e	Fixed issues of publishing APIs to synapse gateway	2016-05-11 10:50:32 +05:30
dilanua	adec59e934	Adding inter-mediate postgre-sql and oracle support to dashboard analytics feature	2016-05-10 15:26:20 +05:30
Dileesha Rajapakse	cb5736854a	Fixed issues in Oracle DB script	2016-05-10 14:58:02 +05:30
Dileesha Rajapakse	de08e96646	Fixed errors in PostgreSQL script	2016-05-09 14:35:45 +05:30