svn commit: r1689373 - /openoffice/ooo-site/trunk/content/download/download.js
Author: marcus Date: Mon Jul 6 11:36:31 2015 New Revision: 1689373 URL: http://svn.apache.org/r1689373 Log: Fixed problem with recognizing newer Mac OS X versions - Part 2 Modified: openoffice/ooo-site/trunk/content/download/download.js Modified: openoffice/ooo-site/trunk/content/download/download.js URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/download.js?rev=1689373r1=1689372r2=1689373view=diff == --- openoffice/ooo-site/trunk/content/download/download.js (original) +++ openoffice/ooo-site/trunk/content/download/download.js Mon Jul 6 11:36:31 2015 @@ -933,7 +933,7 @@ DL.getPlatform = function() { // For more help or data see: http://www.useragentstring.com;. var av, os, ua, ve = ; - + if( navigator.appVersion ) { av = navigator.appVersion.toLowerCase(); // Get the application version in lower case. } @@ -1104,29 +1104,30 @@ DL.getPlatform = function() { if( os.indexOf( mac ) !== -1 ) { DL.UI_PLATFORM = OS X 64-bit (x86-64) (DMG); DL.PLATFORM = mac64; DL.EXTENSION= .dmg; + // OS X: 10.6 or older? - if( ua.indexOf( 10.6 ) !== -1 || - ua.indexOf( 10_6 ) !== -1 || - ua.indexOf( 10.5 ) !== -1 || - ua.indexOf( 10_5 ) !== -1 || - ua.indexOf( 10.4 ) !== -1 || - ua.indexOf( 10_4 ) !== -1 || - ua.indexOf( 10.3 ) !== -1 || - ua.indexOf( 10_3 ) !== -1 ) { DL.UI_PLATFORM = Mac OS X (Version = 10.6); + if( ua.indexOf( 10.6 ) !== -1 || + ua.indexOf( 10_6 ) !== -1 || + ua.indexOf( 10.5 ) !== -1 || + ua.indexOf( 10_5 ) !== -1 || + ua.indexOf( 10.4 ) !== -1 || + ua.indexOf( 10_4 ) !== -1 || + ua.indexOf( 10.3 ) !== -1 || + ua.indexOf( 10_3 ) !== -1 ) { DL.UI_PLATFORM = Mac OS X (Version = 10.6); DL.PLATFORM = mac32; } // OS X: 10.7 or newer? - if( ua.indexOf( 10.11_) !== -1 || - ua.indexOf( 10_11_) !== -1 || - ua.indexOf( 10.10_) !== -1 || - ua.indexOf( 10_10_) !== -1 || - ua.indexOf( 10.9_ ) !== -1 || - ua.indexOf( 10_9_ ) !== -1 || - ua.indexOf( 10.8_ ) !== -1 || - ua.indexOf( 10_8_ ) !== -1 || - ua.indexOf( 10.7_ ) !== -1 || - ua.indexOf( 10_7_ ) !== -1 ) { DL.UI_PLATFORM = OS X 64-bit (x86-64) (DMG); + if( ua.indexOf( 10.11) !== -1 || + ua.indexOf( 10_11) !== -1 || + ua.indexOf( 10.10) !== -1 || + ua.indexOf( 10_10) !== -1 || + ua.indexOf( 10.9 ) !== -1 || + ua.indexOf( 10_9 ) !== -1 || + ua.indexOf( 10.8 ) !== -1 || + ua.indexOf( 10_8 ) !== -1 || + ua.indexOf( 10.7 ) !== -1 || + ua.indexOf( 10_7 ) !== -1 ) { DL.UI_PLATFORM = OS X 64-bit (x86-64) (DMG); DL.PLATFORM = mac64; } }
svn commit: r957210 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/download.js
Author: buildbot Date: Mon Jul 6 11:38:32 2015 New Revision: 957210 Log: Staging update by buildbot for ooo-site Modified: websites/staging/ooo-site/trunk/cgi-bin/ (props changed) websites/staging/ooo-site/trunk/content/ (props changed) websites/staging/ooo-site/trunk/content/download/download.js Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jul 6 11:38:32 2015 @@ -1 +1 @@ -1689237 +1689373 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jul 6 11:38:32 2015 @@ -1 +1 @@ -1689237 +1689373 Modified: websites/staging/ooo-site/trunk/content/download/download.js == --- websites/staging/ooo-site/trunk/content/download/download.js (original) +++ websites/staging/ooo-site/trunk/content/download/download.js Mon Jul 6 11:38:32 2015 @@ -933,7 +933,7 @@ DL.getPlatform = function() { // For more help or data see: http://www.useragentstring.com;. var av, os, ua, ve = ; - + if( navigator.appVersion ) { av = navigator.appVersion.toLowerCase(); // Get the application version in lower case. } @@ -1104,29 +1104,30 @@ DL.getPlatform = function() { if( os.indexOf( mac ) !== -1 ) { DL.UI_PLATFORM = OS X 64-bit (x86-64) (DMG); DL.PLATFORM = mac64; DL.EXTENSION= .dmg; + // OS X: 10.6 or older? - if( ua.indexOf( 10.6 ) !== -1 || - ua.indexOf( 10_6 ) !== -1 || - ua.indexOf( 10.5 ) !== -1 || - ua.indexOf( 10_5 ) !== -1 || - ua.indexOf( 10.4 ) !== -1 || - ua.indexOf( 10_4 ) !== -1 || - ua.indexOf( 10.3 ) !== -1 || - ua.indexOf( 10_3 ) !== -1 ) { DL.UI_PLATFORM = Mac OS X (Version = 10.6); + if( ua.indexOf( 10.6 ) !== -1 || + ua.indexOf( 10_6 ) !== -1 || + ua.indexOf( 10.5 ) !== -1 || + ua.indexOf( 10_5 ) !== -1 || + ua.indexOf( 10.4 ) !== -1 || + ua.indexOf( 10_4 ) !== -1 || + ua.indexOf( 10.3 ) !== -1 || + ua.indexOf( 10_3 ) !== -1 ) { DL.UI_PLATFORM = Mac OS X (Version = 10.6); DL.PLATFORM = mac32; } // OS X: 10.7 or newer? - if( ua.indexOf( 10.11_) !== -1 || - ua.indexOf( 10_11_) !== -1 || - ua.indexOf( 10.10_) !== -1 || - ua.indexOf( 10_10_) !== -1 || - ua.indexOf( 10.9_ ) !== -1 || - ua.indexOf( 10_9_ ) !== -1 || - ua.indexOf( 10.8_ ) !== -1 || - ua.indexOf( 10_8_ ) !== -1 || - ua.indexOf( 10.7_ ) !== -1 || - ua.indexOf( 10_7_ ) !== -1 ) { DL.UI_PLATFORM = OS X 64-bit (x86-64) (DMG); + if( ua.indexOf( 10.11) !== -1 || + ua.indexOf( 10_11) !== -1 || + ua.indexOf( 10.10) !== -1 || + ua.indexOf( 10_10) !== -1 || + ua.indexOf( 10.9 ) !== -1 || + ua.indexOf( 10_9 ) !== -1 || + ua.indexOf( 10.8 ) !== -1 || + ua.indexOf( 10_8 ) !== -1 || + ua.indexOf( 10.7 ) !== -1 || + ua.indexOf( 10_7 ) !== -1 ) { DL.UI_PLATFORM = OS X 64-bit (x86-64) (DMG); DL.PLATFORM = mac64; } }
svn commit: r957211 - in /websites/production/ooo-site: cgi-bin/ content/
Author: marcus Date: Mon Jul 6 11:43:10 2015 New Revision: 957211 Log: Publishing svnmucc operation to ooo-site site by marcus Added: websites/production/ooo-site/cgi-bin/ - copied from r957209, websites/staging/ooo-site/trunk/cgi-bin/ websites/production/ooo-site/content/ - copied from r957209, websites/staging/ooo-site/trunk/content/
buildbot failure in ASF Buildbot on openoffice-linux32-nightly
The Buildbot has detected a failed build on builder openoffice-linux32-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux32-nightly/builds/7 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm2_ubuntu_32bit Build Reason: The Nightly scheduler named 'openoffice-linux32-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: BUILD FAILED: failed Sincerely, -The Buildbot