diff --git a/Disco.BI/Disco.BI.csproj b/Disco.BI/Disco.BI.csproj index 2b08cdcd..43a60eda 100644 --- a/Disco.BI/Disco.BI.csproj +++ b/Disco.BI/Disco.BI.csproj @@ -40,6 +40,9 @@ ..\Resources\Libraries\LibTiff.NET\BitMiracle.LibTiff.NET.dll + + ..\..\..\..\Disco Instance\DiscoDataStore\Plugins\DellWarrantyPlugin\DellWarrantyPlugin.dll + ..\packages\EntityFramework.5.0.0\lib\net45\EntityFramework.dll @@ -222,7 +225,7 @@ - + diff --git a/Disco.Services/App.config b/Disco.Services/App.config index 82fd0cc3..607add54 100644 --- a/Disco.Services/App.config +++ b/Disco.Services/App.config @@ -30,7 +30,7 @@ - + diff --git a/Disco.Web.Extensions/App.config b/Disco.Web.Extensions/App.config index d4a923c0..f38d7d1d 100644 --- a/Disco.Web.Extensions/App.config +++ b/Disco.Web.Extensions/App.config @@ -30,11 +30,11 @@ - + - + diff --git a/Disco.Web/ClientSource/Scripts/Core.js b/Disco.Web/ClientSource/Scripts/Core.js index bd92f877..cb9fd8d7 100644 --- a/Disco.Web/ClientSource/Scripts/Core.js +++ b/Disco.Web/ClientSource/Scripts/Core.js @@ -1,3 +1,4 @@ +///#source 1 1 Core/modernizr-2.7.2.js /*! * Modernizr v2.7.2 * www.modernizr.com @@ -1405,6 +1406,7 @@ window.Modernizr = (function( window, document, undefined ) { })(this, this.document); +///#source 1 1 Core/jquery-2.1.1.js /*! * jQuery JavaScript Library v2.1.1 * http://jquery.com/ @@ -10596,6 +10598,7 @@ return jQuery; })); +///#source 1 1 Core/jquery.validate.js /*! * jQuery Validation Plugin v1.12.0 * @@ -11890,6 +11893,7 @@ $.format = function deprecated() { }); }(jQuery)); +///#source 1 1 Core/jquery.validate.unobtrusive.js /* NUGET: BEGIN LICENSE TEXT * * Microsoft grants you the right to use these script files for the sole @@ -12284,6 +12288,7 @@ $.format = function deprecated() { $jQval.unobtrusive.parse(document); }); }(jQuery)); +///#source 1 1 Core/disco.unobtrusiveValidation.extensions.js // Adapted from: http://xhalent.wordpress.com/2011/01/24/applying-unobtrusive-validation-to-dynamic-content/ (function ($) { $.validator.unobtrusive.reparse = function (selector) { @@ -12319,6 +12324,7 @@ $.format = function deprecated() { }); } })($); +///#source 1 1 Core/jquery-ui-1.10.4.js /*! jQuery UI - v1.10.4 - 2014-01-17 * http://jqueryui.com * Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.position.js, jquery.ui.accordion.js, jquery.ui.autocomplete.js, jquery.ui.button.js, jquery.ui.datepicker.js, jquery.ui.dialog.js, jquery.ui.draggable.js, jquery.ui.droppable.js, jquery.ui.effect.js, jquery.ui.effect-blind.js, jquery.ui.effect-bounce.js, jquery.ui.effect-clip.js, jquery.ui.effect-drop.js, jquery.ui.effect-explode.js, jquery.ui.effect-fade.js, jquery.ui.effect-fold.js, jquery.ui.effect-highlight.js, jquery.ui.effect-pulsate.js, jquery.ui.effect-scale.js, jquery.ui.effect-shake.js, jquery.ui.effect-slide.js, jquery.ui.effect-transfer.js, jquery.ui.menu.js, jquery.ui.progressbar.js, jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.slider.js, jquery.ui.sortable.js, jquery.ui.spinner.js, jquery.ui.tabs.js, jquery.ui.tooltip.js @@ -27328,6 +27334,7 @@ $.widget( "ui.tooltip", { }( jQuery ) ); +///#source 1 1 Core/jquery.watermark.js /* Watermark plugin for jQuery Version: 3.1.4 @@ -27927,6 +27934,7 @@ if ( $.watermark.runOnce ) { })( jQuery, window ); +///#source 1 1 Core/jquery.dataTables.js /** * @summary DataTables * @description Paginate, search and sort HTML tables @@ -40020,6 +40028,7 @@ if ( $.watermark.runOnce ) { */ }(jQuery, window, document, undefined)); +///#source 1 1 Core/moment.js //! moment.js //! version : 2.6.0 //! authors : Tim Wood, Iskren Chernev, Moment.js contributors @@ -42510,6 +42519,7 @@ if ( $.watermark.runOnce ) { } }).call(this); +///#source 1 1 Core/moment.en-au.js // moment.js language configuration // language : australian english (en-au) @@ -42573,7 +42583,9 @@ if ( $.watermark.runOnce ) { }); })); +///#source 1 1 Core/disco.moment.extensions.js moment.lang('en-au'); +///#source 1 1 Core/livestamp.js // Livestamp.js / v1.1.2 / (c) 2012 Matt Bradley / MIT License (function (plugin) { if (typeof define === 'function' && define.amd) { @@ -42717,6 +42729,7 @@ moment.lang('en-au'); return livestampLocal[method](this, options); }; })); +///#source 1 1 Core/disco.dataTables.extensions.js jQuery.fn.dataTableExt.afnSortData['text'] = function (oSettings, iColumn) { var aData = []; $('td:eq(' + iColumn + ')', oSettings.oApi._fnGetTrNodes(oSettings)).each(function () { @@ -42763,6 +42776,7 @@ jQuery.fn.dataTableExt.oSort['disco_datetime-desc'] = function (a, b) { // Change Default Menu Lengths jQuery.fn.DataTable.defaults.aLengthMenu = [[10, 20, 50, -1], [10, 20, 50, "All"]]; +///#source 1 1 Core/disco.uicore.js (function ($, window, document, Modernizr) { // Document Ready diff --git a/Disco.Web/ClientSource/Scripts/Core.js.bundle b/Disco.Web/ClientSource/Scripts/Core.js.bundle index 913b7d44..14ddeaf8 100644 --- a/Disco.Web/ClientSource/Scripts/Core.js.bundle +++ b/Disco.Web/ClientSource/Scripts/Core.js.bundle @@ -1,17 +1,28 @@ - - - /ClientSource/Scripts/Core/modernizr-2.7.2.js - /ClientSource/Scripts/Core/jquery-2.1.1.js - /ClientSource/Scripts/Core/jquery.validate.js - /ClientSource/Scripts/Core/jquery.validate.unobtrusive.js - /ClientSource/Scripts/Core/disco.unobtrusiveValidation.extensions.js - /ClientSource/Scripts/Core/jquery-ui-1.10.4.js - /ClientSource/Scripts/Core/jquery.watermark.js - /ClientSource/Scripts/Core/jquery.dataTables.js - /ClientSource/Scripts/Core/moment.js - /ClientSource/Scripts/Core/moment.en-au.js - /ClientSource/Scripts/Core/disco.moment.extensions.js - /ClientSource/Scripts/Core/livestamp.js - /ClientSource/Scripts/Core/disco.dataTables.extensions.js - /ClientSource/Scripts/Core/disco.uicore.js + + + + + true + + true + + + + + + Core/modernizr-2.7.2.js + Core/jquery-2.1.1.js + Core/jquery.validate.js + Core/jquery.validate.unobtrusive.js + Core/disco.unobtrusiveValidation.extensions.js + Core/jquery-ui-1.10.4.js + Core/jquery.watermark.js + Core/jquery.dataTables.js + Core/moment.js + Core/moment.en-au.js + Core/disco.moment.extensions.js + Core/livestamp.js + Core/disco.dataTables.extensions.js + Core/disco.uicore.js + \ No newline at end of file diff --git a/Disco.Web/ClientSource/Scripts/Core.min.js b/Disco.Web/ClientSource/Scripts/Core.min.js index cb46a3d9..a7d0d0c0 100644 --- a/Disco.Web/ClientSource/Scripts/Core.min.js +++ b/Disco.Web/ClientSource/Scripts/Core.min.js @@ -1 +1,63 @@ -window.Modernizr=function(n,t,i){function a(n){c.cssText=n}function vt(n,t){return a(y.join(n+";")+(t||""))}function h(n,t){return typeof n===t}function v(n,t){return!!~(""+n).indexOf(t)}function lt(n,t){var u,r;for(u in n)if(r=n[u],!v(r,"-")&&c[r]!==i)return t=="pfx"?r:!0;return!1}function yt(n,t,r){var f,u;for(f in n)if(u=t[n[f]],u!==i)return r===!1?n[f]:h(u,"function")?u.bind(r||t):u;return!1}function f(n,t,i){var r=n.charAt(0).toUpperCase()+n.slice(1),u=(n+" "+ot.join(r+" ")+r).split(" ");return h(t,"string")||h(t,"undefined")?lt(u,t):(u=(n+" "+st.join(r+" ")+r).split(" "),yt(u,t,i))}function pt(){u.input=function(i){for(var r=0,u=i.length;r',n,"<\/style>"].join(""),f.id=e,(h?f:o).innerHTML+=l,o.appendChild(f),h||(o.style.background="",o.style.overflow="hidden",v=s.style.overflow,s.style.overflow="hidden",s.appendChild(o)),a=i(f,n),h?f.parentNode.removeChild(f):(o.parentNode.removeChild(o),s.style.overflow=v),!!a},at=function(t){var i=n.matchMedia||n.msMatchMedia,r;return i?i(t).matches:(l("@media "+t+" { #"+e+" { position: absolute; } }",function(t){r=(n.getComputedStyle?getComputedStyle(t,null):t.currentStyle).position=="absolute"}),r)},ct=function(){function r(r,u){u=u||t.createElement(n[r]||"div");r="on"+r;var f=r in u;return f||(u.setAttribute||(u=t.createElement("div")),u.setAttribute&&u.removeAttribute&&(u.setAttribute(r,""),f=h(u[r],"function"),h(u[r],"undefined")||(u[r]=i),u.removeAttribute(r))),u=null,f}var n={select:"input",change:"input",submit:"form",reset:"form",error:"img",load:"img",abort:"img"};return r}(),it={}.hasOwnProperty,rt,k;rt=h(it,"undefined")||h(it.call,"undefined")?function(n,t){return t in n&&h(n.constructor.prototype[t],"undefined")}:function(n,t){return it.call(n,t)};Function.prototype.bind||(Function.prototype.bind=function(n){var t=this,i,r;if(typeof t!="function")throw new TypeError;return i=tt.call(arguments,1),r=function(){var f,e,u;return this instanceof r?(f=function(){},f.prototype=t.prototype,e=new f,u=t.apply(e,i.concat(tt.call(arguments))),Object(u)===u)?u:e:t.apply(n,i.concat(tt.call(arguments)))},r});r.flexbox=function(){return f("flexWrap")};r.flexboxlegacy=function(){return f("boxDirection")};r.canvas=function(){var n=t.createElement("canvas");return!!(n.getContext&&n.getContext("2d"))};r.canvastext=function(){return!!(u.canvas&&h(t.createElement("canvas").getContext("2d").fillText,"function"))};r.webgl=function(){return!!n.WebGLRenderingContext};r.touch=function(){var i;return"ontouchstart"in n||n.DocumentTouch&&t instanceof DocumentTouch?i=!0:l(["@media (",y.join("touch-enabled),("),e,")","{#modernizr{top:9px;position:absolute}}"].join(""),function(n){i=n.offsetTop===9}),i};r.geolocation=function(){return"geolocation"in navigator};r.postmessage=function(){return!!n.postMessage};r.websqldatabase=function(){return!!n.openDatabase};r.indexedDB=function(){return!!f("indexedDB",n)};r.hashchange=function(){return ct("hashchange",n)&&(t.documentMode===i||t.documentMode>7)};r.history=function(){return!!(n.history&&history.pushState)};r.draganddrop=function(){var n=t.createElement("div");return"draggable"in n||"ondragstart"in n&&"ondrop"in n};r.websockets=function(){return"WebSocket"in n||"MozWebSocket"in n};r.rgba=function(){return a("background-color:rgba(150,255,150,.5)"),v(c.backgroundColor,"rgba")};r.hsla=function(){return a("background-color:hsla(120,40%,100%,.5)"),v(c.backgroundColor,"rgba")||v(c.backgroundColor,"hsla")};r.multiplebgs=function(){return a("background:url(https://),url(https://),red url(https://)"),/(url\s*\(.*?){3}/.test(c.background)};r.backgroundsize=function(){return f("backgroundSize")};r.borderimage=function(){return f("borderImage")};r.borderradius=function(){return f("borderRadius")};r.boxshadow=function(){return f("boxShadow")};r.textshadow=function(){return t.createElement("div").style.textShadow===""};r.opacity=function(){return vt("opacity:.55"),/^0.55$/.test(c.opacity)};r.cssanimations=function(){return f("animationName")};r.csscolumns=function(){return f("columnCount")};r.cssgradients=function(){var n="background-image:";return a((n+"-webkit- ".split(" ").join("gradient(linear,left top,right bottom,from(#9f9),to(white));"+n)+y.join("linear-gradient(left top,#9f9, white);"+n)).slice(0,-n.length)),v(c.backgroundImage,"gradient")};r.cssreflections=function(){return f("boxReflect")};r.csstransforms=function(){return!!f("transform")};r.csstransforms3d=function(){var n=!!f("perspective");return n&&"webkitPerspective"in s.style&&l("@media (transform-3d),(-webkit-transform-3d){#modernizr{left:9px;position:absolute;height:3px;}}",function(t){n=t.offsetLeft===9&&t.offsetHeight===3}),n};r.csstransitions=function(){return f("transition")};r.fontface=function(){var n;return l('@font-face {font-family:"font";src:url("https://")}',function(i,r){var f=t.getElementById("smodernizr"),u=f.sheet||f.styleSheet,e=u?u.cssRules&&u.cssRules[0]?u.cssRules[0].cssText:u.cssText||"":"";n=/src/i.test(e)&&e.indexOf(r.split(" ")[0])===0}),n};r.generatedcontent=function(){var n;return l(["#",e,"{font:0/0 a}#",e,':after{content:"',g,'";visibility:hidden;font:3px/1 a}'].join(""),function(t){n=t.offsetHeight>=3}),n};r.video=function(){var i=t.createElement("video"),n=!1;try{(n=!!i.canPlayType)&&(n=new Boolean(n),n.ogg=i.canPlayType('video/ogg; codecs="theora"').replace(/^no$/,""),n.h264=i.canPlayType('video/mp4; codecs="avc1.42E01E"').replace(/^no$/,""),n.webm=i.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,""))}catch(r){}return n};r.audio=function(){var i=t.createElement("audio"),n=!1;try{(n=!!i.canPlayType)&&(n=new Boolean(n),n.ogg=i.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,""),n.mp3=i.canPlayType("audio/mpeg;").replace(/^no$/,""),n.wav=i.canPlayType('audio/wav; codecs="1"').replace(/^no$/,""),n.m4a=(i.canPlayType("audio/x-m4a;")||i.canPlayType("audio/aac;")).replace(/^no$/,""))}catch(r){}return n};r.localstorage=function(){try{return localStorage.setItem(e,e),localStorage.removeItem(e),!0}catch(n){return!1}};r.sessionstorage=function(){try{return sessionStorage.setItem(e,e),sessionStorage.removeItem(e),!0}catch(n){return!1}};r.webworkers=function(){return!!n.Worker};r.applicationcache=function(){return!!n.applicationCache};r.svg=function(){return!!t.createElementNS&&!!t.createElementNS(p.svg,"svg").createSVGRect};r.inlinesvg=function(){var n=t.createElement("div");return n.innerHTML="",(n.firstChild&&n.firstChild.namespaceURI)==p.svg};r.smil=function(){return!!t.createElementNS&&/SVGAnimate/.test(ft.call(t.createElementNS(p.svg,"animate")))};r.svgclippaths=function(){return!!t.createElementNS&&/SVGClipPath/.test(ft.call(t.createElementNS(p.svg,"clipPath")))};for(k in r)rt(r,k)&&(b=k.toLowerCase(),u[b]=r[k](),nt.push((u[b]?"":"no-")+b));return u.input||pt(),u.addTest=function(n,t){if(typeof n=="object")for(var r in n)rt(n,r)&&u.addTest(r,n[r]);else{if(n=n.toLowerCase(),u[n]!==i)return u;t=typeof t=="function"?t():t;typeof d!="undefined"&&d&&(s.className+=" "+(t?"":"no-")+n);u[n]=t}return u},a(""),ut=o=null,function(n,t){function p(n,t){var i=n.createElement("p"),r=n.getElementsByTagName("head")[0]||n.documentElement;return i.innerHTML="x