383 Commits

Author	SHA1	Message	Date
harshanl	ffc9628ae1	Fixed merge issue	2016-08-10 13:14:13 +05:30
harshanl	e25aa26e1b	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-10 12:07:49 +05:30
prabathabey	b28ed6803e	Adding Indexes upon tables that involve in expensive SQL operations	2016-08-10 11:26:07 +05:30
prabathabey	b4479e92ba	Adding Indexes upon tables that involve in expensive SQL operations	2016-08-10 11:25:08 +05:30
harshanl	f82ce82648	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-10 11:14:53 +05:30
harshanl	08ff70bb3c	Refactored CertMgt component	2016-08-10 11:14:46 +05:30
mharindu	886e2e08f2	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl	2016-08-08 18:49:40 +05:30
madhawap	d2ad852db1	changes to certificate-mgt mysql dbscript, fix for the jira EMM-1487	2016-08-05 12:16:59 +05:30
madhawap	682b5f81e0	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-05 12:06:20 +05:30
madhawap	ccae64c374	changes to certificate-mgt mssql dbscript	2016-08-05 12:05:55 +05:30
harshanl	35ea88b9de	Fixed EMM-1476.	2016-08-04 20:39:31 +05:30
madhawap	32fb410da4	mysql db script related changes	2016-08-04 18:15:45 +05:30
mharindu	eb5216091e	Fixed conflicts and merged	2016-08-03 12:36:56 +05:30
harshanl	03835bdeb7	Fixed EMM-1449 issue	2016-08-02 17:40:20 +05:30
harshanl	6cc1bb088c	Fixed EMM-1447, EMM-1424	2016-08-01 20:29:21 +05:30
mharindu	4dc0e23f8d	Added license file to features	2016-07-29 12:44:51 +05:30
mharindu	84090fb16c	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl	2016-07-29 12:39:05 +05:30
Milan Perera	c49dc435e1	Merge pull request #319 from ayyoob/transport ... Updated grant type implementation	2016-07-28 14:14:03 +05:30
prabathabey	5adfab9f8a	Improving connection handling in cert management related functionalities, adding UNIQUE key constraints to DM_DEVICE and DM_ENROLMENT tables, improving response handling of certificate management admin API	2016-07-26 23:37:42 +05:30
mharindu	564c2b280e	Fixed conflicts and merged	2016-07-26 16:38:51 +05:30
prabathabey	ea032337d3	Changing Kernel version that carbon-device-mgt repository depends on and fixing the axiom version range	2016-07-26 11:30:28 +05:30
ayyoob	8eb29a77cc	adding device-mgt-scopes config	2016-07-25 11:46:45 +05:30
hasuniea	74658d1e85	adding certificate scripts	2016-07-22 11:42:55 +05:30
Chatura Dilan	4ec11e8c08	[maven-release-plugin] prepare for next development iteration	2016-07-08 19:11:40 +05:30
Chatura Dilan	ffedcac543	[maven-release-plugin] prepare release v1.1.1	2016-07-08 19:09:55 +05:30
prabathabey	9aa54f2ead	Improving policy management functionalities to use deviceType in place of deviceTypeId for persisting policy information	2016-07-07 13:10:19 +05:30
Chatura Dilan	2befefc967	Added OS build date	2016-07-01 15:45:59 +05:30
prabathabey	49ce42b797	Code cleanup	2016-06-30 18:19:11 +05:30
Chatura Dilan	24b462f4f4	Added is-active field to the Application	2016-06-29 17:41:45 +05:30
Ruwan	6ce7f8c65a	Merge pull request #307 from ayyoob/transport ... Few changes added after testing with the cluster	2016-06-27 09:39:17 +05:30
ayyoob	ba6e202442	Few changes added after testing with the cluster	2016-06-27 00:12:46 +05:30
prabathabey	aeb4ad3295	Merging rest-api-improvements branch to master	2016-06-21 15:52:35 +05:30
ayyoob	ebebca8573	Added support for push notification for xmpp, mqtt and few changes to the after testing	2016-06-20 02:33:59 +05:30
ayyoob	1373e995fb	added support to load device type configuration in base ui	2016-06-17 17:21:39 +05:30
hasuniea	220a34faa9	renamed scep feature	2016-06-10 10:04:52 +05:30
ayyoob	52e84273d1	added profile check before publishing apis	2016-06-08 22:38:49 +05:30
prabathabey	8819c6e36b	Adding support for 'If-Modified-Since' header and 'since' query filter	2016-06-03 04:35:22 +05:30
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