Chris/FlexitimeTracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'IncorrectTooltipDate-#70' into Release0.2

Browse Source
This commit is contained in:
chris.watts90@outlook.com 2017-03-24 21:45:59 +00:00
commit f381923394
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Minifier/Minify.bat
View File

@ -5,7 +5,7 @@ echo "1 - %Directory%"
echo "1a - %SolutionDir%" echo "1a - %SolutionDir%"
call :normalise "%Directory%" call :normalise "%Directory%"
start /wait "" "%Directory%" -xml "%SolutionDir%WindowsDataCenter\Minifier\MinifierConfig.xml" start /wait /min "" "%Directory%" -xml "%SolutionDir%WindowsDataCenter\Minifier\MinifierConfig.xml"
GOTO :EOF GOTO :EOF

2
DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js
View File

@ -163,7 +163,7 @@
} }
self.convertToDisplayDateTime = function (dateValue) { self.convertToDisplayDateTime = function (dateValue) {
var date = new Date(dateValue); // dd MM YY HH:mm:ss e.g.: 01 Mar 17 17:34:02 var date = new Date(dateValue); // dd MM YY HH:mm:ss e.g.: 01 Mar 17 17:34:02
return date.getDay() + " " return date.getDate() + " "
+ date.toLocaleString("en-us", { month: "long" }) + " " + date.toLocaleString("en-us", { month: "long" }) + " "
+ (date.getYear()-100) + " " + (date.getYear()-100) + " "
+ self.padNumber(date.getHours()) + ":" + self.padNumber(date.getHours()) + ":"

2
DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.min.js vendored
View File

File diff suppressed because one or more lines are too long