From 0ab2eb7f382e79810ebf3032ce766a02af2b0f3b Mon Sep 17 00:00:00 2001 From: Abdullah Almsaeed Date: Sun, 3 Jul 2016 11:21:22 -0400 Subject: [PATCH] Update version --- build/less/AdminLTE.less | 2 +- changelog | 7 +++++++ dist/css/AdminLTE.css | 2 +- dist/css/AdminLTE.min.css | 2 +- dist/js/app.js | 2 +- dist/js/app.min.js | 2 +- documentation/build/index.html | 2 +- documentation/index.html | 2 +- index.html | 2 +- index2.html | 2 +- package.json | 2 +- pages/UI/buttons.html | 2 +- pages/UI/general.html | 2 +- pages/UI/icons.html | 2 +- pages/UI/modals.html | 2 +- pages/UI/sliders.html | 2 +- pages/UI/timeline.html | 2 +- pages/calendar.html | 2 +- pages/charts/chartjs.html | 2 +- pages/charts/flot.html | 2 +- pages/charts/inline.html | 2 +- pages/charts/morris.html | 2 +- pages/examples/404.html | 2 +- pages/examples/500.html | 2 +- pages/examples/blank.html | 2 +- pages/examples/invoice.html | 2 +- pages/examples/pace.html | 2 +- pages/examples/profile.html | 2 +- pages/forms/advanced.html | 2 +- pages/forms/editors.html | 2 +- pages/forms/general.html | 2 +- pages/layout/boxed.html | 2 +- pages/layout/collapsed-sidebar.html | 2 +- pages/layout/fixed.html | 2 +- pages/layout/top-nav.html | 2 +- pages/mailbox/compose.html | 2 +- pages/mailbox/mailbox.html | 2 +- pages/mailbox/read-mail.html | 2 +- pages/tables/data.html | 2 +- pages/tables/simple.html | 2 +- pages/widgets.html | 2 +- 41 files changed, 47 insertions(+), 40 deletions(-) diff --git a/build/less/AdminLTE.less b/build/less/AdminLTE.less index c8e9b821436..45f982c1089 100644 --- a/build/less/AdminLTE.less +++ b/build/less/AdminLTE.less @@ -1,5 +1,5 @@ /*! - * AdminLTE v2.3.4 + * AdminLTE v2.3.5 * Author: Almsaeed Studio * Website: Almsaeed Studio * License: Open source - MIT diff --git a/changelog b/changelog index 890ce80ef19..d13a08e9950 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,11 @@ CHANGE LOG: +v2.4.5: +- Fix issue #1097 +- Remove changelog from readme and specify new source +- Merge pull request #1040 from OskarStark/patch-1 +- Update package.json version +- updated changelog with already released versions + v2.3.4 - Fix issue #1093 - Fix issue #427 by updating slimscroll diff --git a/dist/css/AdminLTE.css b/dist/css/AdminLTE.css index 1823a41b207..6147323d785 100644 --- a/dist/css/AdminLTE.css +++ b/dist/css/AdminLTE.css @@ -1,6 +1,6 @@ @import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic); /*! - * AdminLTE v2.3.4 + * AdminLTE v2.3.5 * Author: Almsaeed Studio * Website: Almsaeed Studio * License: Open source - MIT diff --git a/dist/css/AdminLTE.min.css b/dist/css/AdminLTE.min.css index 8509cf39983..00d622f1897 100644 --- a/dist/css/AdminLTE.min.css +++ b/dist/css/AdminLTE.min.css @@ -1,5 +1,5 @@ @import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic);/*! - * AdminLTE v2.3.4 + * AdminLTE v2.3.5 * Author: Almsaeed Studio * Website: Almsaeed Studio * License: Open source - MIT diff --git a/dist/js/app.js b/dist/js/app.js index ed5fc69e609..a4ac47755c0 100644 --- a/dist/js/app.js +++ b/dist/js/app.js @@ -7,7 +7,7 @@ * @Author Almsaeed Studio * @Support * @Email - * @version 2.3.4 + * @version 2.3.5 * @license MIT */ diff --git a/dist/js/app.min.js b/dist/js/app.min.js index 0d4710ef844..def8a04bcf6 100644 --- a/dist/js/app.min.js +++ b/dist/js/app.min.js @@ -7,7 +7,7 @@ * @Author Almsaeed Studio * @Support * @Email - * @version 2.3.4 + * @version 2.3.5 * @license MIT */ function _init(){"use strict";$.AdminLTE.layout={activate:function(){var a=this;a.fix(),a.fixSidebar(),$(window,".wrapper").resize(function(){a.fix(),a.fixSidebar()})},fix:function(){var a=$(".main-header").outerHeight()+$(".main-footer").outerHeight(),b=$(window).height(),c=$(".sidebar").height();if($("body").hasClass("fixed"))$(".content-wrapper, .right-side").css("min-height",b-$(".main-footer").outerHeight());else{var d;b>=c?($(".content-wrapper, .right-side").css("min-height",b-a),d=b-a):($(".content-wrapper, .right-side").css("min-height",c),d=c);var e=$($.AdminLTE.options.controlSidebarOptions.selector);"undefined"!=typeof e&&e.height()>d&&$(".content-wrapper, .right-side").css("min-height",e.height())}},fixSidebar:function(){return $("body").hasClass("fixed")?("undefined"==typeof $.fn.slimScroll&&window.console&&window.console.error("Error: the fixed layout requires the slimscroll plugin!"),void($.AdminLTE.options.sidebarSlimScroll&&"undefined"!=typeof $.fn.slimScroll&&($(".sidebar").slimScroll({destroy:!0}).height("auto"),$(".sidebar").slimscroll({height:$(window).height()-$(".main-header").height()+"px",color:"rgba(0,0,0,0.2)",size:"3px"})))):void("undefined"!=typeof $.fn.slimScroll&&$(".sidebar").slimScroll({destroy:!0}).height("auto"))}},$.AdminLTE.pushMenu={activate:function(a){var b=$.AdminLTE.options.screenSizes;$(document).on("click",a,function(a){a.preventDefault(),$(window).width()>b.sm-1?$("body").hasClass("sidebar-collapse")?$("body").removeClass("sidebar-collapse").trigger("expanded.pushMenu"):$("body").addClass("sidebar-collapse").trigger("collapsed.pushMenu"):$("body").hasClass("sidebar-open")?$("body").removeClass("sidebar-open").removeClass("sidebar-collapse").trigger("collapsed.pushMenu"):$("body").addClass("sidebar-open").trigger("expanded.pushMenu")}),$(".content-wrapper").click(function(){$(window).width()<=b.sm-1&&$("body").hasClass("sidebar-open")&&$("body").removeClass("sidebar-open")}),($.AdminLTE.options.sidebarExpandOnHover||$("body").hasClass("fixed")&&$("body").hasClass("sidebar-mini"))&&this.expandOnHover()},expandOnHover:function(){var a=this,b=$.AdminLTE.options.screenSizes.sm-1;$(".main-sidebar").hover(function(){$("body").hasClass("sidebar-mini")&&$("body").hasClass("sidebar-collapse")&&$(window).width()>b&&a.expand()},function(){$("body").hasClass("sidebar-mini")&&$("body").hasClass("sidebar-expanded-on-hover")&&$(window).width()>b&&a.collapse()})},expand:function(){$("body").removeClass("sidebar-collapse").addClass("sidebar-expanded-on-hover")},collapse:function(){$("body").hasClass("sidebar-expanded-on-hover")&&$("body").removeClass("sidebar-expanded-on-hover").addClass("sidebar-collapse")}},$.AdminLTE.tree=function(a){var b=this,c=$.AdminLTE.options.animationSpeed;$(document).off("click",a+" li a").on("click",a+" li a",function(a){var d=$(this),e=d.next();if(e.is(".treeview-menu")&&e.is(":visible")&&!$("body").hasClass("sidebar-collapse"))e.slideUp(c,function(){e.removeClass("menu-open")}),e.parent("li").removeClass("active");else if(e.is(".treeview-menu")&&!e.is(":visible")){var f=d.parents("ul").first(),g=f.find("ul:visible").slideUp(c);g.removeClass("menu-open");var h=d.parent("li");e.slideDown(c,function(){e.addClass("menu-open"),f.find("li.active").removeClass("active"),h.addClass("active"),b.layout.fix()})}e.is(".treeview-menu")&&a.preventDefault()})},$.AdminLTE.controlSidebar={activate:function(){var a=this,b=$.AdminLTE.options.controlSidebarOptions,c=$(b.selector),d=$(b.toggleBtnSelector);d.on("click",function(d){d.preventDefault(),c.hasClass("control-sidebar-open")||$("body").hasClass("control-sidebar-open")?a.close(c,b.slide):a.open(c,b.slide)});var e=$(".control-sidebar-bg");a._fix(e),$("body").hasClass("fixed")?a._fixForFixed(c):$(".content-wrapper, .right-side").height() .box-body, > .box-footer, > form >.box-body, > form > .box-footer");c.hasClass("collapsed-box")?(a.children(":first").removeClass(b.icons.open).addClass(b.icons.collapse),d.slideDown(b.animationSpeed,function(){c.removeClass("collapsed-box")})):(a.children(":first").removeClass(b.icons.collapse).addClass(b.icons.open),d.slideUp(b.animationSpeed,function(){c.addClass("collapsed-box")}))},remove:function(a){var b=a.parents(".box").first();b.slideUp(this.animationSpeed)}}}if("undefined"==typeof jQuery)throw new Error("AdminLTE requires jQuery");$.AdminLTE={},$.AdminLTE.options={navbarMenuSlimscroll:!0,navbarMenuSlimscrollWidth:"3px",navbarMenuHeight:"200px",animationSpeed:500,sidebarToggleSelector:"[data-toggle='offcanvas']",sidebarPushMenu:!0,sidebarSlimScroll:!0,sidebarExpandOnHover:!1,enableBoxRefresh:!0,enableBSToppltip:!0,BSTooltipSelector:"[data-toggle='tooltip']",enableFastclick:!1,enableControlSidebar:!0,controlSidebarOptions:{toggleBtnSelector:"[data-toggle='control-sidebar']",selector:".control-sidebar",slide:!0},enableBoxWidget:!0,boxWidgetOptions:{boxWidgetIcons:{collapse:"fa-minus",open:"fa-plus",remove:"fa-times"},boxWidgetSelectors:{remove:'[data-widget="remove"]',collapse:'[data-widget="collapse"]'}},directChat:{enable:!0,contactToggleSelector:'[data-widget="chat-pane-toggle"]'},colors:{lightBlue:"#3c8dbc",red:"#f56954",green:"#00a65a",aqua:"#00c0ef",yellow:"#f39c12",blue:"#0073b7",navy:"#001F3F",teal:"#39CCCC",olive:"#3D9970",lime:"#01FF70",orange:"#FF851B",fuchsia:"#F012BE",purple:"#8E24AA",maroon:"#D81B60",black:"#222222",gray:"#d2d6de"},screenSizes:{xs:480,sm:768,md:992,lg:1200}},$(function(){"use strict";$("body").removeClass("hold-transition"),"undefined"!=typeof AdminLTEOptions&&$.extend(!0,$.AdminLTE.options,AdminLTEOptions);var a=$.AdminLTE.options;_init(),$.AdminLTE.layout.activate(),$.AdminLTE.tree(".sidebar"),a.enableControlSidebar&&$.AdminLTE.controlSidebar.activate(),a.navbarMenuSlimscroll&&"undefined"!=typeof $.fn.slimscroll&&$(".navbar .menu").slimscroll({height:a.navbarMenuHeight,alwaysVisible:!1,size:a.navbarMenuSlimscrollWidth}).css("width","100%"),a.sidebarPushMenu&&$.AdminLTE.pushMenu.activate(a.sidebarToggleSelector),a.enableBSToppltip&&$("body").tooltip({selector:a.BSTooltipSelector}),a.enableBoxWidget&&$.AdminLTE.boxWidget.activate(),a.enableFastclick&&"undefined"!=typeof FastClick&&FastClick.attach(document.body),a.directChat.enable&&$(document).on("click",a.directChat.contactToggleSelector,function(){var a=$(this).parents(".direct-chat").first();a.toggleClass("direct-chat-contacts-open")}),$('.btn-group[data-toggle="btn-toggle"]').each(function(){var a=$(this);$(this).find(".btn").on("click",function(b){a.find(".btn.active").removeClass("active"),$(this).addClass("active"),b.preventDefault()})})}),function(a){"use strict";a.fn.boxRefresh=function(b){function c(a){a.append(f),e.onLoadStart.call(a)}function d(a){a.find(f).remove(),e.onLoadDone.call(a)}var e=a.extend({trigger:".refresh-btn",source:"",onLoadStart:function(a){return a},onLoadDone:function(a){return a}},b),f=a('
');return this.each(function(){if(""===e.source)return void(window.console&&window.console.log("Please specify a source first - boxRefresh()"));var b=a(this),f=b.find(e.trigger).first();f.on("click",function(a){a.preventDefault(),c(b),b.find(".box-body").load(e.source,function(){d(b)})})})}}(jQuery),function(a){"use strict";a.fn.activateBox=function(){a.AdminLTE.boxWidget.activate(this)},a.fn.toggleBox=function(){var b=a(a.AdminLTE.boxWidget.selectors.collapse,this);a.AdminLTE.boxWidget.collapse(b)},a.fn.removeBox=function(){var b=a(a.AdminLTE.boxWidget.selectors.remove,this);a.AdminLTE.boxWidget.remove(b)}}(jQuery),function(a){"use strict";a.fn.todolist=function(b){var c=a.extend({onCheck:function(a){return a},onUncheck:function(a){return a}},b);return this.each(function(){"undefined"!=typeof a.fn.iCheck?(a("input",this).on("ifChecked",function(){var b=a(this).parents("li").first();b.toggleClass("done"),c.onCheck.call(b)}),a("input",this).on("ifUnchecked",function(){var b=a(this).parents("li").first();b.toggleClass("done"),c.onUncheck.call(b)})):a("input",this).on("change",function(){var b=a(this).parents("li").first();b.toggleClass("done"),a("input",b).is(":checked")?c.onCheck.call(b):c.onUncheck.call(b)})})}}(jQuery); \ No newline at end of file diff --git a/documentation/build/index.html b/documentation/build/index.html index 6fc6316d4dc..e5479ef67fd 100644 --- a/documentation/build/index.html +++ b/documentation/build/index.html @@ -158,7 +158,7 @@

Copyright © 2014-2016 Almsaeed Studio. All rights reserved.
diff --git a/documentation/index.html b/documentation/index.html index c750f004186..1bb7e8397e0 100644 --- a/documentation/index.html +++ b/documentation/index.html @@ -2135,7 +2135,7 @@

AdminLTE

Copyright © 2014-2016 Almsaeed Studio. All rights reserved.
diff --git a/index.html b/index.html index 17b81bc9e42..21efd909f95 100644 --- a/index.html +++ b/index.html @@ -1015,7 +1015,7 @@

Calendar