2035 Commits

Author	SHA1	Message	Date
mharindu	24930b3042	Partial commit of migration	2016-09-05 16:37:09 +05:30
mharindu	d7e8cc30dd	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.7	2016-08-24 14:56:06 +05:30
harshanl	f3aefcca77	Fixed EMM-1450	2016-08-23 17:57:08 +05:30
hasuniea	e723761344	fixing code conflicts	2016-08-19 16:21:20 +05:30
Chatura Dilan Perera	8b17cbb339	Fix conflicts	2016-08-19 15:00:57 +05:30
hasuniea	b3582f9d47	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-19 13:40:21 +05:30
dilanua	7bc927fbd0	Removing obsolete constants from constants.js - UI	2016-08-19 11:52:24 +05:30
dilanua	fbd51e31c0	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-19 10:50:31 +05:30
dilanua	13e2381293	Updating OAuth Utils - UI	2016-08-19 10:50:12 +05:30
Chatura Dilan Perera	654e1d9938	[maven-release-plugin] prepare for next development iteration	2016-08-18 22:09:42 +05:30
Chatura Dilan Perera	aa24821667	[maven-release-plugin] prepare release v1.1.2	2016-08-18 22:09:33 +05:30
harshanl	67942d5c1d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-18 19:45:47 +05:30
dilanua	0ba6edf36d	Updating utility.js and removing unused config files - UI	2016-08-18 18:41:07 +05:30
dilanua	e32c9c0bdb	Updating init.js module - UI	2016-08-18 18:27:24 +05:30
dilanua	f61b929bfd	Updating data-tables API - UI	2016-08-18 18:11:31 +05:30
dilanua	78b5cf9fb3	Updating user APIs - UI	2016-08-18 16:27:07 +05:30
dilanua	4eaa3be491	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-18 16:24:22 +05:30
dilanua	83498b1039	Updating operation APIs	2016-08-18 16:23:57 +05:30
kamidu	8eeabcee2c	Fix for Jira issue EMM-1418	2016-08-18 15:21:52 +05:30
hasuniea	1ba598a93e	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-18 15:12:50 +05:30
dilanua	6b4ab635af	Fixing jiras: EMM-1472, EMM-1505	2016-08-18 14:30:53 +05:30
charitha	3d19d9ed2e	Add MySQLOperationDAOImpl for row locking.	2016-08-18 14:26:53 +05:30
hasuniea	6db619317c	fixing app-install issue	2016-08-17 15:29:51 +05:30
harshanl	2cb8f0b313	Fixed EMM-1392	2016-08-16 18:02:30 +05:30
harshanl	d81733a4d6	Removed unused class	2016-08-16 18:01:49 +05:30
kamidu	4506db3647	Fix notification view issue	2016-08-16 14:53:44 +05:30
kamidu	77a8fed7de	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-16 10:39:10 +05:30
hasuniea	5c57b664ad	fixing getAllActivity H2 issue	2016-08-16 09:57:32 +05:30
Ruwan	6134f94e3c	Merge pull request #332 from ayyoob/com ... fixing commit issues	2016-08-16 08:27:17 +05:30
hasuniea	282f53bf09	Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.3	2016-08-15 21:00:23 +05:30
hasuniea	c269f35ef2	fixing getAllActivity H2 issue	2016-08-15 21:00:15 +05:30
harshanl	d628699e8b	Fixed repeating task operations.	2016-08-15 20:58:04 +05:30
mharindu	af286b8aaf	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-15 20:31:00 +05:30
mharindu	7346313d27	Modified scope management service	2016-08-15 20:30:45 +05:30
harshanl	2bf6f562df	Fixed repeating task operations.	2016-08-15 20:17:20 +05:30
kamidu	28760d2bee	Enable advanced search for devices	2016-08-15 18:05:10 +05:30
dilanua	b37687cb58	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-15 17:56:19 +05:30
dilanua	8cb26b3264	Fixing no api resource found issue: changing user credentials	2016-08-15 17:55:46 +05:30
ayyoob	a7c201363c	logged exception trace	2016-08-15 15:20:37 +05:30
ayyoob	442c2b86da	fixed formatting issues	2016-08-15 15:19:18 +05:30
ayyoob	892d5cee20	avoided lazy inialization	2016-08-15 15:13:39 +05:30
harshanl	a7d7c689e8	Removed unsupported roleName parameter from device API	2016-08-15 13:59:30 +05:30
harshanl	671ba46fae	Removed unnecessary properties from EnrollmentInfo object	2016-08-15 13:44:10 +05:30
harshanl	d401741d9b	Fixed EMM-1492	2016-08-15 13:43:54 +05:30
Ace	e5a4c0f795	Adding role add/update/delete related changes	2016-08-15 11:37:57 +05:30
ayyoob	e45ba68a90	changing the context of device-types api	2016-08-13 10:54:32 +05:30
ayyoob	3b56668af0	merged with upstream	2016-08-13 10:47:18 +05:30
ayyoob	c04edef151	Added Certificate Configuration	2016-08-13 10:38:09 +05:30
dilanua	fcff1f0854	Fixing user menu reg exp issue	2016-08-12 20:00:46 +05:30
dilanua	106051a0a5	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-12 17:57:49 +05:30