svn commit: r1833174 - in /ofbiz/ofbiz-framework/branche
Locked
 
|
Author: mbrohl
Date: Fri Jun 8 14:46:12 2018 New Revision: 1833174 URL: http://svn.apache.org/viewvc?rev=1833174&view=rev Log: Applied fix from trunk for revision: 1833173 === Improved: Add a VERSION file in root dir. (OFBIZ-10141) This adds a VERSION file to store the release version information and changes the footer of the themes to show the release version. Added: ofbiz/ofbiz-framework/branches/release17.12/VERSION - copied, changed from r1833173, ofbiz/ofbiz-framework/trunk/VERSION Modified: ofbiz/ofbiz-framework/branches/release17.12/ (props changed) ofbiz/ofbiz-framework/branches/release17.12/themes/flatgrey/template/Footer.ftl ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/template/includes/Footer.ftl ofbiz/ofbiz-framework/branches/release17.12/themes/tomahawk/template/Footer.ftl Propchange: ofbiz/ofbiz-framework/branches/release17.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jun 8 14:46:12 2018 @@ -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:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944 +/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173 Copied: ofbiz/ofbiz-framework/branches/release17.12/VERSION (from r1833173, ofbiz/ofbiz-framework/trunk/VERSION) URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/VERSION?p2=ofbiz/ofbiz-framework/branches/release17.12/VERSION&p1=ofbiz/ofbiz-framework/trunk/VERSION&r1=1833173&r2=1833174&rev=1833174&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/VERSION (original) +++ ofbiz/ofbiz-framework/branches/release17.12/VERSION Fri Jun 8 14:46:12 2018 @@ -1 +1 @@ -trunk \ No newline at end of file +17.12.01 Modified: ofbiz/ofbiz-framework/branches/release17.12/themes/flatgrey/template/Footer.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/themes/flatgrey/template/Footer.ftl?rev=1833174&r1=1833173&r2=1833174&view=diff ============================================================================== --- ofbiz/ofbiz-framework/branches/release17.12/themes/flatgrey/template/Footer.ftl (original) +++ ofbiz/ofbiz-framework/branches/release17.12/themes/flatgrey/template/Footer.ftl Fri Jun 8 14:46:12 2018 @@ -27,6 +27,7 @@ under the License. <a href="http://ofbiz.apache.org" class="noicon">OFBiz </a></span><span class="footerTextColour">Copyright 2001-${nowTimestamp?string("yyyy")} <a href="http://www.apache.org" class="noicon">The Apache Software Foundation - www.apache.org</a></span> <span class="footerTextColour"> + ${uiLabelMap.CommonRelease} <#include "ofbizhome://VERSION" ignore_missing=true/> <#include "ofbizhome://runtime/SvnInfo.ftl" ignore_missing=true/> <#include "ofbizhome://runtime/GitInfo.ftl" ignore_missing=true/> </span> Modified: ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/template/includes/Footer.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/template/includes/Footer.ftl?rev=1833174&r1=1833173&r2=1833174&view=diff ============================================================================== --- ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/template/includes/Footer.ftl (original) +++ ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/template/includes/Footer.ftl Fri Jun 8 14:46:12 2018 @@ -21,7 +21,8 @@ under the License. <span>${nowTimestamp?datetime?string.short} - <a href="<@ofbizUrl>ListTimezones</@ofbizUrl>">${timeZone.getDisplayName(timeZone.useDaylightTime(), Static["java.util.TimeZone"].LONG, locale)}</a></span> <span>${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} <a href="http://www.apache.org" target="_blank">The Apache Software Foundation</a>. ${uiLabelMap.CommonPoweredBy} - <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz.</a> + <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz.</a> ${uiLabelMap.CommonRelease} + <#include "ofbizhome://VERSION" ignore_missing=true/> <#include "ofbizhome://runtime/SvnInfo.ftl" ignore_missing=true/> <#include "ofbizhome://runtime/GitInfo.ftl" ignore_missing=true/> </span> Modified: ofbiz/ofbiz-framework/branches/release17.12/themes/tomahawk/template/Footer.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/themes/tomahawk/template/Footer.ftl?rev=1833174&r1=1833173&r2=1833174&view=diff ============================================================================== --- ofbiz/ofbiz-framework/branches/release17.12/themes/tomahawk/template/Footer.ftl (original) +++ ofbiz/ofbiz-framework/branches/release17.12/themes/tomahawk/template/Footer.ftl Fri Jun 8 14:46:12 2018 @@ -23,7 +23,8 @@ under the License. <ul> <li> ${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" target="_blank">www.apache.org</a><br/> - ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a> + ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a> ${uiLabelMap.CommonRelease} + <#include "ofbizhome://VERSION" ignore_missing=true/> <#include "ofbizhome://runtime/SvnInfo.ftl" ignore_missing=true/> <#include "ofbizhome://runtime/GitInfo.ftl" ignore_missing=true/> </li> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |