877 Commits

Author	SHA1	Message	Date
Chatura Dilan Perera	de23a8cf27	[maven-release-plugin] prepare for next development iteration	2016-09-09 20:18:25 +05:30
Chatura Dilan Perera	8905fae0d9	[maven-release-plugin] prepare release v1.2.0	2016-09-09 20:18:12 +05:30
thusithakalugamage	0d02e88955	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration	2016-09-09 18:42:46 +05:30
kamidu	878daae5c5	Permission modifications	2016-09-09 17:47:42 +05:30
Chatura Dilan Perera	2d5262e21e	[maven-release-plugin] prepare for next development iteration	2016-09-09 17:10:19 +05:30
Chatura Dilan Perera	5ccd752404	[maven-release-plugin] prepare release v1.2.0	2016-09-09 17:10:04 +05:30
harshanl	d60daae97f	MSSQL fixes to dbscrpits and DAO layer	2016-09-09 12:15:51 +05:30
harshanl	1e00a012a8	Removed unnecessary import statements	2016-09-09 10:07:16 +05:30
harshanl	0ee6110b3d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-09 09:57:48 +05:30
mharindu	115099c8fe	Implemented permission based authorization	2016-09-09 02:56:21 +05:30
charitha	de6f2558c5	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-08 14:48:38 +05:30
charitha	2fde165b7c	Fix SQL error when could happen due to duplicate enrollments. ... (cherry picked from commit c75307f)	2016-09-08 14:47:21 +05:30
harshanl	b7ffaf0b0f	Fixed issues in DAO implementations and MSSQL db script	2016-09-07 15:01:09 +05:30
harshanl	bdb5b970fd	Removed access modifiers from Interface APIs	2016-09-05 11:51:51 +05:30
harshanl	6554368bfa	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-31 11:04:44 +05:30
harshanl	551d77bd62	Refactored OperationMgr code	2016-08-30 16:58:25 +05:30
kamidu	cd77ce692e	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-30 16:37:34 +05:30
kamidu	abb3aea9a9	fixes for notification isses	2016-08-30 16:36:26 +05:30
harshanl	675843d7f7	Added Valid device list to Activity response	2016-08-30 15:53:07 +05:30
harshanl	a77564ac2d	Added status for each device in Activity response	2016-08-30 14:53:56 +05:30
Chatura Dilan Perera	83442b0bca	Fixed issue in activity retrival	2016-08-29 15:52:54 +05:30
Chatura Dilan Perera	29d6b38d15	Fixed issue in activity getting with response	2016-08-29 15:52:36 +05:30
Chatura Dilan Perera	40cabd0064	Merge branch 'master' of github.com:wso2/carbon-device-mgt	2016-08-27 01:53:20 +05:30
Chatura Dilan Perera	549a2773f2	Fixed issue releated to activity api since	2016-08-27 01:52:48 +05:30
harshanl	624bf7c7b4	Fixed EMM-1518	2016-08-26 23:07:07 +05:30
harshanl	56f23a83fc	changed comments	2016-08-26 20:52:14 +05:30
Charitha Goonetilleke	9e0edf84ab	Merge pull request #337 from charithag/master ... Fix issue in get devices with since parameter	2016-08-25 14:12:59 +05:30
harshanl	811d225bc3	Fixed adding operations to invalid devices	2016-08-25 13:58:38 +05:30
charitha	0fe827ca9f	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-25 13:10:48 +05:30
charitha	579d91bd79	Fix issue in get devices with since parameter.	2016-08-25 13:10:23 +05:30
Chatura Dilan Perera	16e6e12436	Fixed issue in Activity API returning one activity	2016-08-25 11:53:29 +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
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
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	d81733a4d6	Removed unused class	2016-08-16 18:01:49 +05:30
hasuniea	5c57b664ad	fixing getAllActivity H2 issue	2016-08-16 09:57:32 +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	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
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	d8c6720857	Removing previous query	2016-08-12 13:44:26 +05:30
Ace	aa01c7a52e	Adding query improvements to activities retrieval query	2016-08-12 13:40:49 +05:30
hasuniea	349c3bdb63	fixing App Version not updating in portal after being initially set	2016-08-11 15:56:03 +05:30