svn commit: r1863843 - in /ofbiz/ofbiz-framework/branche
Locked
svn commit: r1863843 - in /ofbiz/ofbiz-framework/branche
 
|
Author: adityasharma
Date: Sat Jul 27 08:53:46 2019 New Revision: 1863843 URL: http://svn.apache.org/viewvc?rev=1863843&view=rev Log: Applied fix from trunk for revision: 1863838 === Fixed: Check embedded Javascript libs vulnerabilities using retire.js (OFBIZ-10678) 1. For solving CVE-2019-11358, upgraded jQuery to 3.4.1 2. Replaced library Fancybox with Featherlight. Added custom css so that cursor for links becomes pointer Thanks Jacques Le Roux for the reviews Added: ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/webapp/common/js/jquery/jquery-3.4.1.js - copied unchanged from r1863838, ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/common/js/jquery/jquery-3.4.1.js ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/webapp/common/js/jquery/jquery-3.4.1.min.js - copied unchanged from r1863838, ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/common/js/jquery/jquery-3.4.1.min.js ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/webapp/common/js/jquery/plugins/featherlight/ - copied from r1863838, ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/common/js/jquery/plugins/featherlight/ Removed: ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/webapp/common/js/jquery/jquery-3.2.1.js ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/webapp/common/js/jquery/jquery-3.2.1.min.js ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/webapp/common/js/jquery/plugins/fancybox/ Modified: ofbiz/ofbiz-framework/branches/release18.12/ (props changed) ofbiz/ofbiz-framework/branches/release18.12/themes/bluelight/webapp/bluelight/style.css ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/template/includes/ListVisualThemes.ftl ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/widget/CommonScreens.xml ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/widget/Theme.xml ofbiz/ofbiz-framework/branches/release18.12/themes/flatgrey/webapp/flatgrey/style.css ofbiz/ofbiz-framework/branches/release18.12/themes/rainbowstone/webapp/rainbowstone/style.css ofbiz/ofbiz-framework/branches/release18.12/themes/tomahawk/webapp/tomahawk/css/style.css Propchange: ofbiz/ofbiz-framework/branches/release18.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jul 27 08:53:46 2019 @@ -10,4 +10,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911,1859915,1859931,1859968,1859972,1859981,1860082,1860141, 1860274,1860357,1860526,1860592,1860597,1860613,1860797,1861615,1861811,1861815,1861828,1861834,1861837,1861849,1861859,1861869,1862045-1862046,1862207,1862271,1862278,1862466,1862648,1863560 +/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911,1859915,1859931,1859968,1859972,1859981,1860082,1860141, 1860274,1860357,1860526,1860592,1860597,1860613,1860797,1861615,1861811,1861815,1861828,1861834,1861837,1861849,1861859,1861869,1862045-1862046,1862207,1862271,1862278,1862466,1862648,1863560,1863838 Modified: ofbiz/ofbiz-framework/branches/release18.12/themes/bluelight/webapp/bluelight/style.css URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/themes/bluelight/webapp/bluelight/style.css?rev=1863843&r1=1863842&r2=1863843&view=diff ============================================================================== --- ofbiz/ofbiz-framework/branches/release18.12/themes/bluelight/webapp/bluelight/style.css (original) +++ ofbiz/ofbiz-framework/branches/release18.12/themes/bluelight/webapp/bluelight/style.css Sat Jul 27 08:53:46 2019 @@ -4068,3 +4068,7 @@ html > /**/ body .jstree-default a { border-color: #848484 #c1c1c1 #e1e1e1; min-height: unset !important; } +/* The custom CSS to show mouse pointer on links using featherlight plugin */ +a[data-featherlight] { + cursor: pointer; +} \ No newline at end of file Modified: ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/template/includes/ListVisualThemes.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/template/includes/ListVisualThemes.ftl?rev=1863843&r1=1863842&r2=1863843&view=diff ============================================================================== --- ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/template/includes/ListVisualThemes.ftl (original) +++ ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/template/includes/ListVisualThemes.ftl Sat Jul 27 08:53:46 2019 @@ -23,26 +23,6 @@ margin: 1em; } </style> --> - -<script type="application/javascript" src="/common/js/jquery/plugins/fancybox/jquery.fancybox-3.2.3.min.js"></script> -<link rel="stylesheet" href="/common/js/jquery/plugins/fancybox/jquery.fancybox-3.2.3.min.css" type="text/css" media="screen"/> - -<script type="application/javascript"> - $(document).ready(function () { - $("a#single_image").fancybox(); - $("a#inline").fancybox({ - 'hideOnContentClick': true - }); - $("a.group").fancybox({ - 'transitionIn': 'elastic', - 'transitionOut': 'elastic', - 'speedIn': 600, - 'speedOut': 200, - 'overlayShow': false - }); - }); -</script> - <div class="screenlet" style="margin: 1em;"> <div class="screenlet-title-bar"> <ul> @@ -75,7 +55,7 @@ margin: 1em; <td> <#if visualTheme.getScreenshots()?has_content> <#list visualTheme.getScreenshots() as screenshot> - <a id="single_image" href="<@ofbizContentUrl>${screenshot}</@ofbizContentUrl>"><img + <a data-featherlight="<@ofbizContentUrl>${screenshot}</@ofbizContentUrl>"><img src="<@ofbizContentUrl>${screenshot}</@ofbizContentUrl>" width="150" alt=""/></a> </#list> Modified: ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/widget/CommonScreens.xml?rev=1863843&r1=1863842&r2=1863843&view=diff ============================================================================== --- ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/widget/CommonScreens.xml Sat Jul 27 08:53:46 2019 @@ -351,13 +351,15 @@ under the License. <set field="defaultOrganizationPartyId" from-field="userPreferences.ORGANIZATION_PARTY" global="true"/> <set field="messagesTemplateLocation" from-field="layoutSettings.VT_MSG_TMPLT_LOC" default-value="component://common-theme/template/includes/Messages.ftl"/> + <set field="layoutSettings.styleSheets[]" value="/common/js/jquery/plugins/featherlight/featherlight-1.7.13.min.css" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/plugins/featherlight/featherlight-1.7.13.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/plugins/select2/js/select2-4.0.6.js"/> <set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-1.6.3.min.js"/> <set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/ui/jquery-ui-1.12.1.min.js"/> <set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/plugins/validate/jquery.validate.min.js"/> <set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/plugins/browser-plugin/jquery.browser-0.1.0.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/jquery-migrate-3.0.0.min.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/jquery-3.2.1.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/jquery-3.4.1.min.js" global="true"/> <set field="layoutSettings.javaScripts[]" value="/common/js/util/OfbizUtil.js" global="true"/> </actions> <widgets> @@ -448,7 +450,7 @@ under the License. <set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/plugins/validate/jquery.validate.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/plugins/browser-plugin/jquery.browser-0.1.0.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/jquery-migrate-3.0.0.min.js" global="true" /> - <set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/jquery-3.2.1.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/common/js/jquery/jquery-3.4.1.min.js" global="true"/> <!-- jQuery CSSs --> <set field="layoutSettings.styleSheets[+0]" value="/common/js/jquery/plugins/select2/css/select2-4.0.6.css" global="true"/> <set field="layoutSettings.styleSheets[+0]" value="/common/js/jquery/ui/jquery-ui-1.12.1.min.css" global="true" /> Modified: ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/widget/Theme.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/widget/Theme.xml?rev=1863843&r1=1863842&r2=1863843&view=diff ============================================================================== --- ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/widget/Theme.xml (original) +++ ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/widget/Theme.xml Sat Jul 27 08:53:46 2019 @@ -57,7 +57,7 @@ under the License. <property name="VT_NAV_TMPLT_LOC" value="component://flatgrey/template/AppBar.ftl"/> <property name="VT_MSG_TMPLT_LOC" value="component://common-theme/template/includes/Messages.ftl"/> <!--javascript libs--> - <property name="VT_HDR_JAVASCRIPT['add']" value="/common/js/jquery/jquery-3.2.1.min.js"/> + <property name="VT_HDR_JAVASCRIPT['add']" value="/common/js/jquery/jquery-3.4.1.min.js"/> <property name="VT_HDR_JAVASCRIPT['add']" value="/common/js/jquery/jquery-migrate-3.0.0.min.js"/> <property name="VT_HDR_JAVASCRIPT['add']" value="/common/js/jquery/plugins/browser-plugin/jquery.browser-0.1.0.min.js"/> <property name="VT_HDR_JAVASCRIPT['add']" value="/common/js/jquery/ui/jquery-ui-1.12.1.min.js"/> Modified: ofbiz/ofbiz-framework/branches/release18.12/themes/flatgrey/webapp/flatgrey/style.css URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/themes/flatgrey/webapp/flatgrey/style.css?rev=1863843&r1=1863842&r2=1863843&view=diff ============================================================================== --- ofbiz/ofbiz-framework/branches/release18.12/themes/flatgrey/webapp/flatgrey/style.css (original) +++ ofbiz/ofbiz-framework/branches/release18.12/themes/flatgrey/webapp/flatgrey/style.css Sat Jul 27 08:53:46 2019 @@ -2258,4 +2258,8 @@ html > /**/ body .jstree-default a { border-radius: 0px; border-color: #848484 #c1c1c1 #e1e1e1; min-height: unset !important; +} +/* The custom CSS to show mouse pointer on links using featherlight plugin */ +a[data-featherlight] { + cursor: pointer; } \ No newline at end of file Modified: ofbiz/ofbiz-framework/branches/release18.12/themes/rainbowstone/webapp/rainbowstone/style.css URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/themes/rainbowstone/webapp/rainbowstone/style.css?rev=1863843&r1=1863842&r2=1863843&view=diff ============================================================================== --- ofbiz/ofbiz-framework/branches/release18.12/themes/rainbowstone/webapp/rainbowstone/style.css (original) +++ ofbiz/ofbiz-framework/branches/release18.12/themes/rainbowstone/webapp/rainbowstone/style.css Sat Jul 27 08:53:46 2019 @@ -1911,4 +1911,8 @@ html > /**/ body .jstree-default a { border-radius: 0px; border-color: #848484 #c1c1c1 #e1e1e1; min-height: unset !important; +} +/* The custom CSS to show mouse pointer on links using featherlight plugin */ +a[data-featherlight] { + cursor: pointer; } \ No newline at end of file Modified: ofbiz/ofbiz-framework/branches/release18.12/themes/tomahawk/webapp/tomahawk/css/style.css URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1863843&r1=1863842&r2=1863843&view=diff ============================================================================== --- ofbiz/ofbiz-framework/branches/release18.12/themes/tomahawk/webapp/tomahawk/css/style.css (original) +++ ofbiz/ofbiz-framework/branches/release18.12/themes/tomahawk/webapp/tomahawk/css/style.css Sat Jul 27 08:53:46 2019 @@ -4527,4 +4527,8 @@ html > /**/ body .jstree-default a { .button-bar > a.buttontext { text-transform:none!important; +} +/* The custom CSS to show mouse pointer on links using featherlight plugin */ +a[data-featherlight] { + cursor: pointer; } \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |