Merge remote-tracking branch 'WebPlatformTest/version-9.0' into version-9.0

Author: dstorey

.gitignore

@@ -1,3 +1,4 @@
 backend/config.php
 composer.lock
 vendor/
+.DS_Store

.htaccess

@@ -29,8 +29,6 @@ RewriteRule ^results/search.html$			/backend/controllers/search.php
 RewriteRule ^results/related/(.+).html$ 	/backend/controllers/fingerprint.php?id=$1
 RewriteRule ^results/(.+)/timeline/(.+).html$ 	/backend/controllers/timeline.php?id=$2&type=$1
 RewriteRule ^results/timeline/(.+).html$ 	/backend/controllers/timeline.php?id=$1&type=mobile
-RewriteRule ^devicelab/inventory.html$		/backend/controllers/lab-inventory.php
-RewriteRule ^devicelab/?$					/backend/controllers/lab.php
 
 RewriteRule ^favicon(.*)$					/images/icons/favicon$1
 RewriteRule ^apple-touch-icon(.*)$			/images/icons/apple-touch-icon$1
@@ -52,6 +50,12 @@ RewriteRule ^scripts/useragents				http://api.whichbrowser.net/warning.js
 </IfModule>
 </FilesMatch>
 
+<FilesMatch "upgrade">
+<IfModule mod_headers.c>
+    Header set Access-Control-Allow-Origin "*"
+</IfModule>
+</FilesMatch>
+
 
 SetEnvIf User-Agent .*Bada.* BROKEN_CSP
 

about.html

@@ -41,8 +41,6 @@ <h1><span>HTML<strong>5</strong>test</span> <em>how well does your browser suppo
 					<li><a href='/compare/browser/index.html'>Compare</a></li>
 				</ul>
 				<ul class='right'>
-					<li><a href='http://blog.html5test.com/'>News</a></li>
-					<li><a href='/devicelab'>Device Lab</a></li>
 					<li class='selected'><a href='/about.html'>About<span> the test</span></a></li>
 				</ul>
 			</div>

assets/upgrade

@@ -0,0 +1 @@
+OK

backend/controllers/lab-inventory.php

@@ -18,7 +18,6 @@
 
 	include('libraries/database.php');
 	include('libraries/tools.php');
-	include('models/lab.php');
 	include('models/raw.php');
 	include('models/browsers.php');
 	include('models/results.php');
@@ -96,13 +95,6 @@
 			echo json_encode(Raw::search($_REQUEST['query']));
 			break;
 
-		case 'loadLabDevice':
-			if ($data = Lab::getDevice($_REQUEST['id'])) {
-				echo json_encode($data);
-			}
-
-			break;
-
 		case 'loadFeature':
 			echo json_encode(array(
 				'key'		=> $_REQUEST['key'],

backend/controllers/lab.php

@@ -54,8 +54,6 @@ <h1><span>HTML<strong>5</strong>test</span> <em>how well does your browser suppo
 					<li class='selected'><a href='/compare/browser/index.html'>Compare</a></li>
 				</ul>
 				<ul class='right'>
-					<li><a href='http://blog.html5test.com/'>News</a></li>
-					<li><a href='/devicelab'>Device Lab</a></li>
 					<li><a href='/about.html'>About<span> the test</span></a></li>
 				</ul>
 			</div>

backend/index.php

@@ -44,8 +44,6 @@ <h1><span>HTML<strong>5</strong>test</span> <em>how well does your browser suppo
 					<li class='selected'><a href='/compare/browser/index.html'>Compare</a></li>
 				</ul>
 				<ul class='right'>
-					<li><a href='http://blog.html5test.com/'>News</a></li>
-					<li><a href='/devicelab'>Device Lab</a></li>
 					<li><a href='/about.html'>About<span> the test</span></a></li>
 				</ul>
 			</div>