2096 Commits

Author	SHA1	Message	Date
Imesh Chandrasiri	fe0bdb9ba6	Merge Conflicts Fixed	2016-09-05 14:45:41 +05:30
Imesh Chandrasiri	d1acfe1503	Modal Changes added	2016-09-05 14:44:21 +05:30
harshanl	bdb5b970fd	Removed access modifiers from Interface APIs	2016-09-05 11:51:51 +05:30
harshanl	8e6c15acf2	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-05 09:49:16 +05:30
dilanua	e881aa6da4	Fixing Role Editing UI	2016-09-02 18:55:00 +05:30
dilanua	c57e9eba3a	Updating Roles listing UI to dynamically fetch app-context	2016-09-02 18:08:27 +05:30
dilanua	0427a6dd4b	Refactoring Role Create UI - moving units to page	2016-09-02 18:00:40 +05:30
dilanua	934c45cd95	Adding role creation UI	2016-09-02 17:43:43 +05:30
dilanua	746a4d4372	Refactoring roles listing UI - merging srcs in units to page	2016-09-02 10:27:52 +05:30
dilanua	fd6ddf7a52	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-01 22:31:21 +05:30
dilanua	677385920e	Updating User Listing UI	2016-09-01 22:30:49 +05:30
Rasika Perera	ad5c97e354	Temporary resolving WARN logs for css fonts on the theme.	2016-09-01 22:12:51 +05:30
dilanua	687efa97b1	Updating Role Listing UI	2016-09-01 20:12:47 +05:30
dilanua	eedb66ec45	Updating User Listing UI	2016-09-01 19:08:20 +05:30
dilanua	6f28bf1d94	Updating User Listing UI	2016-09-01 18:51:26 +05:30
dilanua	32fc58c917	Updating User Listing UI	2016-09-01 17:49:16 +05:30
dilanua	54807b99ee	Updating role listing UI	2016-09-01 17:00:43 +05:30
Rasika Perera	8148b5b06c	Separating CDMF base app and uuf-template app	2016-09-01 16:28:05 +05:30
Imesh Chandrasiri	4a69e162b3	Modal Changes added	2016-09-01 12:09:24 +05:30
Imesh Chandrasiri	1ed6213916	Modal Changes added	2016-09-01 10:51:38 +05:30
harshanl	54112a3f3d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-01 10:25:37 +05:30
charitha	3575c9a33d	Fix issue in get devices with since parameter.	2016-08-31 17:43:13 +05:30
Chatura Dilan Perera	f29b9e84f2	Fixed 200 returns when activities are empty and since is a future date	2016-08-31 13:56:59 +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	9aa5f2793f	return date format as UTC in APIs	2016-08-30 14:17:06 +05:30
Chatura Dilan Perera	475b832c59	Changed return date format to UTC date	2016-08-29 18:50:23 +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
hasuniea	1ebf4e2c7c	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-26 17:42:32 +05:30
hasuniea	d1e058ce8e	fixing api-mgt upgrading issues	2016-08-26 17:40:30 +05:30
Imesh Chandrasiri	e02264099b	Adding user menu update	2016-08-26 16:05:29 +05:30
thusithakalugamage	00bf595cb2	moving wso2 theme to emm - removing duplicated styles for buttons and links, navbar style update	2016-08-26 15:56:25 +05:30
thusithakalugamage	42a3d5f7e5	moving wso2 theme to emm - modal window content positioning and background fixes	2016-08-26 14:19:24 +05:30
thusithakalugamage	b5fda80377	emm login page layouts updated to wso2 theme markup	2016-08-26 13:39:10 +05:30
thusithakalugamage	b67b34e831	cdmf navbar hamburger menu and menu open state icons correction	2016-08-26 11:52:18 +05:30
thusithakalugamage	6b5d884fd5	vertical tab component bottom margin defect fix	2016-08-26 11:50:29 +05:30
thusithakalugamage	333e05dcc5	Merge branch 'theme-migration' of https://github.com/DimalChandrasiri/carbon-device-mgt into theme-migration	2016-08-26 10:25:14 +05:30
thusithakalugamage	ee856d6b8b	moving wso2 theme to emm - link hover defect fix	2016-08-26 07:43:06 +05:30
thusithakalugamage	cd6cf9f6b3	moving wso2 theme to emm - navbar cllapse color fixes	2016-08-26 06:03:22 +05:30
thusithakalugamage	849c2a4f55	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration	2016-08-25 14:44:51 +05:30
Imesh Chandrasiri	5cdafa04a6	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration	2016-08-25 14:44:31 +05:30