Merge branch 'master' into 'master'

Make device analytics timestamp human-readable

Closes product-iots#139

See merge request entgra/carbon-device-mgt!234

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.analytics-view/public/js/device.js

@@ -45,7 +45,14 @@ function drawTable(from, to) {
 			order: [],
 			ajax: {
 				url: "/devicemgt/api/stats/paginate",
-				data: buildAjaxData
+				data: buildAjaxData,
+				dataSrc: function(json) {
+				    return json.data.map(function(event) {
+				        event[0] = new moment(event[0]).
+				        format("YYYY-MM-DD HH:mm:ss.SSS");
+				        return event;
+				    })
+				}
 			}
 		});
 	}
@@ -71,4 +78,4 @@ function buildAjaxData (){
 	return obj;
 
 
-}
+}