1107 Commits

Author	SHA1	Message	Date
Gathika94	c22a7f1882	minor ui changes	2017-11-23 15:57:54 +05:30
Gathika94	356063a247	removed warnings created in geo deivice locations dashboard	2017-11-23 10:51:22 +05:30
Gathika94	81b036678a	minor changes in device locations UI	2017-11-23 10:22:31 +05:30
Gathika94	cec1e1393e	removed unnecessary files	2017-11-22 23:34:08 +05:30
Gathika94	dcac19480f	removed unnecessary files	2017-11-22 23:26:09 +05:30
Gathika94	f4af47fae4	added unit and page	2017-11-22 21:42:54 +05:30
Gathika94	d3eb32b5cc	working on ui features	2017-11-22 16:06:31 +05:30
warunalakshitha	22c4753f74	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into remote-control	2017-11-17 14:46:42 +05:30
Charitha Goonetilleke	44592b2043	Revert "Resolving conflicts for Remote Control feature on behalf of Waruna"	2017-11-17 14:33:45 +05:30
Ace	4b2955984f	Resolving conflicts for Remote Control feature on behalf of Waruna	2017-11-17 14:27:30 +05:30
Ruwan	ee0195f740	Merge pull request #950 from dilee/master ... Minor refactorings and fixing formatting issues	2017-11-17 10:16:27 +05:30
Madawa Soysa	33e39415de	Revert "Fix for EMM-1298"	2017-11-02 14:18:45 +05:30
charitha	b3094277fd	Merge branch 'master' into add-emm-analytics ... # Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/search/util/Utils.java	2017-10-30 10:11:15 +05:30
kamidu	9fb13e38cf	enable billing cache invalidation	2017-10-23 12:52:45 +05:30
charitha	9f94f86401	Rename GeoAnalyticsConfigurations to OperationAnalyticsConfiguration	2017-10-06 13:38:03 +05:30
warunalakshitha	719dd24d57	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into remote-control	2017-10-01 10:50:04 +05:30
Ace	d74aadae20	Tidying up the topic browser view	2017-09-21 14:42:00 +05:30
Ace	7601decaaf	removing un-necessary new line	2017-09-21 11:13:57 +05:30
Dileesha Rajapakse	b566d98ecf	Fixed formatting issues	2017-09-18 10:57:51 +05:30
Dileesha Rajapakse	5cb6bc2afa	Fixing formatting issues	2017-09-18 10:20:27 +05:30
Dileesha Rajapakse	eaf6b304fe	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-09-18 10:04:19 +05:30
Sameera Wickramasekara	fcd322cb21	Update operation status header on click	2017-09-15 15:38:36 +05:30
Harshan Liyanage	46761ed76d	Resolved wso2/product-iots#1348	2017-09-13 14:23:08 +05:30
Dileesha Rajapakse	5b33f791ae	Minor refactorings and fixing formatting issues	2017-09-06 11:04:15 +05:30
Harshan Liyanage	a3aa259437	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-09-04 10:06:40 +05:30
Harshan Liyanage	66d237cf61	Fixed merge conflicts.	2017-09-01 20:44:08 +05:30
Harshan Liyanage	79abb6ef86	Fixed merge conflicts.	2017-09-01 20:40:42 +05:30
Harshan Liyanage	bbbd199cf7	Resolved wso2/product-iots#1035	2017-09-01 20:30:37 +05:30
Pasindu	0684257a6c	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-09-01 17:01:28 +05:30
Pasindu	8000124f8c	Fixes validation of role when creating new user	2017-09-01 16:48:30 +05:30
sinthuja	77c02fae46	Merge pull request #943 from Nirothipan/master ... Fixing User create form error when creating a new user. #1360	2017-09-01 16:04:02 +05:30
Pasindu	f8f82e66db	Fix validate error display issue	2017-09-01 15:51:57 +05:30
Nirothipan	dc9eac3ac8	fixing product-iots#1360	2017-09-01 15:51:54 +05:30
Pasindu	1581775aa6	Fixes validation issue in create group	2017-09-01 15:38:28 +05:30
amalhub	5fc833332a	Resolves: https://github.com/wso2/product-iots/issues/1302	2017-09-01 15:27:06 +05:30
Menaka Jayawardena	54b616985e	Added check for updating admin user by typing the url + code formatting.	2017-08-31 19:30:40 +05:30
Menaka Jayawardena	21b0ed284b	Removed hardcoded admin user name.	2017-08-31 19:30:40 +05:30
Menaka Jayawardena	b04bb5f1f1	Disabled edit button for admin role.	2017-08-31 19:30:40 +05:30
amalhub	308a2809ef	Resolves: https://github.com/wso2/product-iots/issues/1161	2017-08-31 15:20:05 +05:30
Charitha Goonetilleke	0f7e488d2b	Merge pull request #934 from ruwany/master ... Adding fix for https://github.com/wso2/product-iots/issues/667	2017-08-31 13:44:35 +05:30
Ace	77152ca0a5	Adding fix for https://github.com/wso2/product-iots/issues/667	2017-08-31 12:49:57 +05:30
Menaka Jayawardena	8cac8a3bdc	Added edit buttons for User and policy views.	2017-08-31 12:04:27 +05:30
Menaka Jayawardena	29086834eb	Added tooltips for policy listing page.	2017-08-31 12:04:27 +05:30
warunalakshitha	a5e22c652b	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into remote-control	2017-08-31 11:52:39 +05:30
Menaka Jayawardena	9f2603a126	Bring the roles select list in-front of the modal and set colors of selected roles.	2017-08-30 17:47:13 +05:30
Nirothipan	46921ac277	Resolving conflicts	2017-08-30 17:06:48 +05:30
Nirothipan	9d3b2ebf42	fixes for product-iots #504	2017-08-30 16:20:32 +05:30
Harshan Liyanage	28cc62b405	Merge pull request #929 from amalhub/master ... Resolves: https://github.com/wso2/product-iots/issues/1008	2017-08-30 14:45:27 +05:30
amalhub	eed54aaf9f	Resolves: https://github.com/wso2/product-iots/issues/1008	2017-08-30 14:32:21 +05:30
Ruwan	72956afd5a	Merge pull request #928 from sinthuja/master ... Fixing the issue in resetting the password for the email user	2017-08-30 14:32:07 +05:30