2214 Commits

Author	SHA1	Message	Date
Ace	f4d6eb6898	Upgrading jscep and other fixes	2016-09-22 08:24:58 +05:30
Ace	9548bdc263	Fixing dependency related issues	2016-09-21 12:56:40 +05:30
Ace	5f90587564	Synching with master	2016-09-20 18:13:53 +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
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
dilanua	b4e4b114a5	Updating dashboard title	2016-09-18 17:01:36 +05:30
dilanua	e8571b7b65	Updating operation-mod with windows operation apis	2016-09-18 16:06:32 +05:30
dilanua	408e10a890	Changing admin dashboard name to 'Navigating Dashboard' - UI	2016-09-18 08:39:41 +05:30
dilanua	713c8ac4d8	Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations	2016-09-18 07:34:14 +05:30
dilanua	cd66f64945	Correcting typo: diableScreenCapture to disableScreenCapture - Operation-mod & Policy UI	2016-09-17 20:05:34 +05:30
dilanua	37131afb4a	Adding radio:checked and input[type=hidden] support to operation mod - UI	2016-09-17 19:57:02 +05:30
dilanua	e4dae67fea	Changing permissions - /devices/any to /devices/any-device	2016-09-17 17:36:06 +05:30
dilanua	58f8656e94	Changing permissions - /devices/owning to /devices/owning-device	2016-09-17 17:22:47 +05:30
Rasika Perera	d9b25eda08	Adding deviceName into notifications	2016-09-16 09:39:21 +05:30
Dilan U. Ariyaratne	1651ade4a7	Merge pull request #357 from thusithak/master ... Theme migration - 2.2.0 alpha defect fixes	2016-09-15 16:49:41 +05:30
Dilan U. Ariyaratne	df7c54b1af	Merge pull request #356 from DimalChandrasiri/theme-migration ... Model Fixes	2016-09-15 16:49:14 +05:30
thusithakalugamage	2f5d90cb6c	[EMM-1571] Add policies page wizard styling and layout defects	2016-09-15 13:46:48 +05:30
harshanl	5b0e99aeff	Fixed EMM-1562	2016-09-15 12:37:35 +05:30
harshanl	78cab76101	Fixed EMM-1531	2016-09-15 12:36:55 +05:30
Imesh Chandrasiri	1599b84e54	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration	2016-09-15 10:19:42 +05:30
Imesh Chandrasiri	e2576b21a8	Adding default button class to modal popups	2016-09-15 10:19:22 +05:30
kamidu	a448959fe0	Fix for EMM-1548	2016-09-15 06:40:05 +05:30
Ace	1dfb8e22e1	Updating to latest appm/apim/identity dependencies	2016-09-14 17:23:09 +05:30
kamidu	e2d0f7d040	Fix for EMM-1559	2016-09-14 16:23:21 +05:30
Imesh Chandrasiri	3e5064feed	Fix for datatable icon size change on pagination	2016-09-14 15:13:54 +05:30
Imesh Chandrasiri	9573bce48f	Fix for datatable icon size change on pagination	2016-09-14 14:35:56 +05:30
Imesh Chandrasiri	317252ebb0	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration	2016-09-14 10:22:00 +05:30
Rasika Perera	1d7546916c	Changes to the policiesCount, rolesCount, usersCount methods	2016-09-14 07:09:05 +05:30
Rasika Perera	0fab418187	Fixing invalid device count and group count	2016-09-13 19:43:43 +05:30
Imesh Chandrasiri	b56fb667b7	Modal fixes	2016-09-13 15:16:50 +05:30
kamidu	d7c7315f16	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-13 12:15:03 +05:30
kamidu	70dd5ded77	Fix for the policy edit internal server issue	2016-09-13 12:14:55 +05:30
Dilan U. Ariyaratne	3cbaecfbbf	Merge pull request #355 from DimalChandrasiri/theme-migration ... Data Table CSS Removed from custom.desktop file	2016-09-13 11:19:30 +05:30
thusithakalugamage	144dd92c47	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-12 18:09:57 +05:30
thusithakalugamage	d2a44647dd	[EMM-1549] - Heading defect fix	2016-09-12 18:09:33 +05:30
dilanua	00d79c9ece	Changing certificates breadcrumb name from certificate to certificates - UI	2016-09-12 17:09:40 +05:30
Imesh Chandrasiri	7a452d09ab	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration	2016-09-12 15:18:37 +05:30
Imesh Chandrasiri	e3b230937e	Remove data table styles	2016-09-12 15:18:21 +05:30
thusithakalugamage	4cb5238112	[EMM-1543] styling defect fix	2016-09-12 14:37:52 +05:30
thusithakalugamage	3b3962b772	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-12 14:36:25 +05:30