366 Commits

Author	SHA1	Message	Date
madhawap	7b8518a9db	changes to swagger SecurityDefinitionConfigurator and annotations	2016-10-06 11:59:20 +05:30
Chatura Dilan Perera	c16cc4cae1	[maven-release-plugin] prepare for next development iteration	2016-09-29 20:33:07 +05:30
Chatura Dilan Perera	ed4bca7032	[maven-release-plugin] prepare release v1.2.2	2016-09-29 20:32:59 +05:30
warunalakshitha	25ed0cf370	Fix build issue with swagger version	2016-09-29 18:28:09 +05:30
warunalakshitha	397c1daa2a	Fix package import conflicts of org.wso2.carbon.device.mgt.common bundle	2016-09-29 00:40:58 +05:30
amalhub	428ce25b6f	Fixing issue: https://wso2.org/jira/browse/EMM-1646	2016-09-27 20:46:00 +05:30
Ace	154a6082ce	Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 ... # Conflicts: # features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml	2016-09-22 19:08:21 +05:30
Ace	33d8829540	Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 ... # Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java	2016-09-20 17:02:28 +05:30
Ace	87ad1e0e71	Fixing intermittent jackson bind issue	2016-09-20 12:07:14 +05:30
Chatura Dilan Perera	50d8885f8b	[maven-release-plugin] prepare for next development iteration	2016-09-19 18:54:48 +05:30
Chatura Dilan Perera	a00d6aafd4	[maven-release-plugin] prepare release v1.2.1	2016-09-19 18:54:38 +05:30
harshanl	75df243a33	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-19 12:22:08 +05:30
Ace	6a8a5cbd5a	Merging with master	2016-09-19 12:21:41 +05:30
harshanl	4169d3b2bd	Fixed EMM-1554	2016-09-19 12:08:06 +05:30
Rasika Perera	d9b25eda08	Adding deviceName into notifications	2016-09-16 09:39:21 +05:30
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
mharindu	115099c8fe	Implemented permission based authorization	2016-09-09 02:56:21 +05:30
mharindu	24930b3042	Partial commit of migration	2016-09-05 16:37:09 +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	a77564ac2d	Added status for each device in Activity response	2016-08-30 14:53:56 +05:30
Chatura Dilan Perera	8b17cbb339	Fix conflicts	2016-08-19 15:00:57 +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
hasuniea	6db619317c	fixing app-install issue	2016-08-17 15:29:51 +05:30
mharindu	7346313d27	Modified scope management service	2016-08-15 20:30:45 +05:30
harshanl	671ba46fae	Removed unnecessary properties from EnrollmentInfo object	2016-08-15 13:44:10 +05:30
hasuniea	349c3bdb63	fixing App Version not updating in portal after being initially set	2016-08-11 15:56:03 +05:30
harshanl	8fa311e119	Removed unnecessary properties from EnrollmentInfo object	2016-08-10 18:25:35 +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	eb5216091e	Fixed conflicts and merged	2016-08-03 12:36:56 +05:30
madhawap	d315e739e4	fix for the iOS device operations blocker	2016-08-02 19:04:28 +05:30
mharindu	564c2b280e	Fixed conflicts and merged	2016-07-26 16:38:51 +05:30
Chatura Dilan	7af8ecc686	Added userstore for role listing	2016-07-26 11:59:10 +05:30
mharindu	827567733c	Fixed scope update issue in API update	2016-07-22 16:41:40 +05:30
mharindu	b3d309583d	Fixed issues in scope service	2016-07-21 20:13:38 +05:30
mharindu	7f1e2fdf0b	Implemented scope management service	2016-07-21 12:43:21 +05:30
mharindu	0f904e21d8	Fixed conflicts and merged	2016-07-11 22:12:15 +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
mharindu	ac75ff1d71	Fixed conflict and merged	2016-07-03 15:09:05 +05:30
mharindu	49623a4693	Implemented scope based authorization	2016-07-03 15:03:47 +05:30
Chatura Dilan	2befefc967	Added OS build date	2016-07-01 15:45:59 +05:30
madhawap	b55a164457	added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations	2016-06-30 20:38:04 +05:30