3080 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
hasuniea	1ba598a93e	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-18 15:12:50 +05:30
Chatura Dilan	f5e40d9085	Merge pull request #333 from charithag/carbon-kernel-4.4.3 ... Improvements for MySQL databases	2016-08-18 14:40:53 +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
charitha	017b652372	Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.3	2016-08-18 12:16:56 +05:30
charitha	d0cb80273b	Add indexing to mysql	2016-08-18 11:41:15 +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
harshanl	a2a030423b	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-15 12:21:46 +05:30
Ace	e5a4c0f795	Adding role add/update/delete related changes	2016-08-15 11:37:57 +05:30
harshanl	596dfcc26c	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-15 10:48:42 +05:30
Ruwan	6a580994fb	Merge pull request #331 from ayyoob/com ... Added platform configuration and certificate configuration UI	2016-08-13 11:16:55 +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
dilanua	e07991174d	Adding user password change UI	2016-08-12 17:57:28 +05:30
kamidu	83cbd56b03	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-12 17:41:33 +05:30
kamidu	0be419d6cc	Fix ui issues in device view section	2016-08-12 17:41:27 +05:30
harshanl	42c47cfff2	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-12 16:37:36 +05:30
dilanua	f71106d011	Fixing issues on Password Reset UI	2016-08-12 15:01:51 +05:30
dilanua	0836b2c99e	Fixing user create page QR-generation issues	2016-08-12 14:46:17 +05:30
kamidu	42b6882cc1	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-12 14:32:12 +05:30
dilanua	73b4abc46b	Updating user remove UI	2016-08-12 14:24:38 +05:30
dilanua	4acfde1511	Adding user edit UI and fixes	2016-08-12 14:08:46 +05:30
kamidu	3219ac2101	Fixing the notification listing ui	2016-08-12 14:04:16 +05:30
harshanl	6bb924fa7b	Removed unnecessary mysql query from the mysl script	2016-08-12 13:53:32 +05:30
dilanua	312f9d3f26	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-12 13:50:00 +05:30
dilanua	280c5e496d	Adding user edit UI and fixes	2016-08-12 13:49:38 +05:30