2253 Commits

Author	SHA1	Message	Date
Imesh Chandrasiri	2c0df21491	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration	2016-09-26 19:37:43 +05:30
kamidu	225268bd78	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-26 18:05:36 +05:30
kamidu	0ab9db2afd	Fix for EMM-1575	2016-09-26 18:05:29 +05:30
dilanua	378dd4084c	FIX for JIRAS: https://wso2.org/jira/browse/EMM-1591,EMM-1590,EMM-1585	2016-09-26 17:27:57 +05:30
harshanl	1a12838b7c	Fixed issue in NotificationDAO due to invalid column name	2016-09-26 17:16:27 +05:30
harshanl	27a9eeb692	Removed unnecessary DM service	2016-09-23 23:22:58 +05:30
harshanl	f24242fb8a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-23 21:17:50 +05:30
harshanl	dd03d0b740	Added device status change upon inactivity mechanism	2016-09-23 21:17:37 +05:30
Ruwan	0c92f80e68	Merge pull request #361 from ruwany/carbon-kernel-4.4.7 ... Migrating kernel/apim/appm/identity to latest versions	2016-09-23 17:04:18 +05:30
dilanua	ebead1249c	Fix for jira: https://wso2.org/jira/browse/EMM-1617	2016-09-23 11:38:40 +05:30
Ace	6aad76eff1	Synching with master and updating jscep and bcpkix dependencies	2016-09-23 11:24:49 +05:30
dilanua	87a03e8312	Fix for jira: https://wso2.org/jira/browse/EMM-1617	2016-09-23 11:15:12 +05:30
dilanua	71424c4bb7	Fix for JIRA: https://wso2.org/jira/browse/EMM-1613	2016-09-22 22:47:18 +05:30
dilanua	e3256417a3	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-22 22:16:24 +05:30
dilanua	a4b39f92e5	Fix for JIRA: https://wso2.org/jira/browse/EMM-1593	2016-09-22 22:15:55 +05:30
harshanl	5a6120d6fa	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-22 20:31:14 +05:30
harshanl	1b6c7ea502	Refactored PolcyMgt component	2016-09-22 20:30:18 +05:30
dilanua	92aa413773	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-22 19:53:36 +05:30
dilanua	f7a38b2313	Fix for JIRA: https://wso2.org/jira/browse/EMM-1612	2016-09-22 19:53:18 +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
harshanl	17127c3846	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-22 16:54:56 +05:30
Rasika Perera	98ab29fe94	Fixing virtual firealarm device agent download	2016-09-22 15:53:16 +05:30
Rasika Perera	eb5a36ef42	Supporting stream download on service invoker	2016-09-22 15:52:52 +05:30
Rasika Perera	728307defd	Adding bundle import	2016-09-22 14:57:00 +05:30
Rasika Perera	4691bedbc5	Fixes to devices listing	2016-09-22 14:35:17 +05:30
Rasika Perera	c6c555abc6	Fixing null pointer issue on mqtt notification strategy implementation	2016-09-22 14:34:25 +05:30
Rasika Perera	1d3f5f39a7	Adding custom headers support to invoker util	2016-09-22 14:33:53 +05:30
Imesh Chandrasiri	f8b08849cd	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration	2016-09-22 14:14:20 +05:30
Imesh Chandrasiri	3d5b6cd89f	Removing unwanted url params from datatable serverside search	2016-09-22 14:14:07 +05:30
harshanl	12713f3301	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-22 10:45:47 +05:30
Rasika Perera	e71d3947cb	Adding intuitive error when specified notification provider is not found	2016-09-22 08:57:34 +05:30
Rasika Perera	513015c1b5	Changing context path /emm into /devicemgt on cdmf base app	2016-09-22 08:56:41 +05:30
Rasika Perera	0fb87f3aa2	Fixing device types not shown issue	2016-09-22 08:56:12 +05:30
Rasika Perera	9148c3baea	Fixing dashboard styling issues	2016-09-22 08:55:29 +05:30
Ace	f4d6eb6898	Upgrading jscep and other fixes	2016-09-22 08:24:58 +05:30
harshanl	108ea98677	Refactor policy mgt components and fixed add operations for invalid devices from task service	2016-09-21 19:44:46 +05:30
Ace	9548bdc263	Fixing dependency related issues	2016-09-21 12:56:40 +05:30
harshanl	c967fc34d0	Fixed EMM-1513	2016-09-20 18:43:50 +05:30
Ace	5f90587564	Synching with master	2016-09-20 18:13:53 +05:30
Chatura Dilan Perera	7395c76408	Merge branch 'master' of github.com:wso2/carbon-device-mgt	2016-09-20 17:45:24 +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
dilanua	81c684be50	Refactoring user-menu - UI	2016-09-20 16:27:07 +05:30
dilanua	d8e057abdd	Fix for JIRA: https://wso2.org/jira/browse/EMM-1582	2016-09-20 15:28:45 +05:30
dilanua	6fea974c90	Refactoring notifications side-pane - UI	2016-09-20 14:21:17 +05:30
dilanua	ce1a063688	Refactoring notifications side-pane - UI	2016-09-20 12:49:41 +05:30
dilanua	9a095fa670	Refactoring change password modal - UI	2016-09-20 12:14:45 +05:30
Ace	87ad1e0e71	Fixing intermittent jackson bind issue	2016-09-20 12:07:14 +05:30
dilanua	b16f0fd592	Refactoring change password modal - UI	2016-09-20 11:27:04 +05:30
Ace	099ffd6a74	Updating velocity dependencies to OSGI enabled bundle version	2016-09-20 10:38:39 +05:30
Chatura Dilan Perera	50d8885f8b	[maven-release-plugin] prepare for next development iteration	2016-09-19 18:54:48 +05:30