Merge branch 'master' of https://github.com/popcorn-official/popcorn-site

10 years ago · 8390aa5821
parent f8ed33a546 55e2c93e91
commit 8390aa5821
3 changed files with 7 additions and 8 deletions
--- a/faq.html
+++ b/faq.html
@ -63,8 +63,8 @@

 	<meta property="og:title" content="Popcorn Time" />
 	<meta property="og:type" content="website" />
-	<meta property="og:image" content="http://popcorn-time.tv/images/header-ui.png" />
-	<meta property="og:url" content="http://popcorn-time.tv" />
+	<meta property="og:image" content="http://get-popcorn.com/images/header-ui.png" />
+	<meta property="og:url" content="http://get-popcorn.com/" />
 	<meta property="og:site_name" content="Popcorn Time" />
 </head>
 <body id="page-faq" class="beta">
@ -86,8 +86,8 @@

 	<div class="container fadeIn wow">
 		<section id="faq" class="fixed-width">
-			<p class="warning">To enjoy a great experience, always make sure you're running <a href="http://popcorn-time.tv" target="_blank">the latest Popcorn Time version</a>. <br/>
-			Our only official site is <a href="/" target="_blank">popcorn-time.tv</a> (for now). Do not get the app from anywhere else, as there's a few fake sites going around.</p>
+			<p class="warning">To enjoy a great experience, always make sure you're running <a href="http://get-popcorn.com/" target="_blank">the latest Popcorn Time version</a>. <br/>
+			Our only official site is <a href="/" target="_blank">get-popcorn.com</a> (for now). Do not get the app from anywhere else, as there's a few fake sites going around.</p>

 			<article id="what">
 				<h1>Frequently Asked Questions</h1>
--- a/index.html
+++ b/index.html
@ -64,8 +64,8 @@

 	<meta property="og:title" content="Popcorn Time" />
 	<meta property="og:type" content="website" />
-	<meta property="og:image" content="http://popcorn-time.tv/images/header-ui.jpg" />
-	<meta property="og:url" content="http://popcorn-time.tv" />
+	<meta property="og:image" content="http://get-popcorn.com/images/header-ui.jpg" />
+	<meta property="og:url" content="http://get-popcorn.com/" />
 	<meta property="og:site_name" content="Popcorn Time" />
 </head>
 <body class="beta">
--- a/js/site.js
+++ b/js/site.js
@ -1,5 +1,4 @@
-var userAgent = navigator.platform,
-    fileHost = "http://cdn.popcorn-time.tv/";
+var userAgent = navigator.platform;

 var mac = /Mac/,
    win = /Win/,