Update

qmutz · Apr 3, 2014 · bf8261c · bf8261c
1 parent cbc4abf
commit bf8261c
Show file tree

Hide file tree

Showing 21 changed files with 39 additions and 30 deletions.
diff --git a/.htaccess b/.htaccess
@@ -1,7 +1,7 @@
-rewriteEngine On
-rewriteRule ^([0-z]+)$ index.html
+#rewriteEngine On
+#rewriteRule ^([0-z]+)$ index.html
 <IfModule mod_headers.c>
 #Header set Access-Control-Allow-Origin "*"
 #Header set Access-Control-Allow-Headers "uloffset, ulkey"
-#Header set Content-Security-Policy "default-src 'self' *.mega.co.nz http://*.mega.co.nz; script-src 'self' mega.co.nz data: blob:; style-src 'self' 'unsafe-inline' *.mega.co.nz data: blob:; frame-src 'self' mega:; img-src 'self' *.mega.co.nz data: blob:;"
+Header set Content-Security-Policy "default-src 'self' *.mega.co.nz http://*.mega.co.nz; script-src 'self' mega.co.nz data: blob: 'unsafe-eval'; style-src 'self' 'unsafe-inline' *.mega.co.nz data: blob:; frame-src 'self' mega:; img-src 'self' *.mega.co.nz data: blob:"
 </IfModule>
diff --git a/chrome.xml b/chrome.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='kpgogfgfingilcbkpahnggpfdabapnol'>
-    <updatecheck codebase='http://eu.static.mega.co.nz/mega.crx' version='1.0.144' />
+    <updatecheck codebase='http://eu.static.mega.co.nz/mega.crx' version='1.0.146' />
   </app>
 </gupdate>
diff --git a/html/resellers.html b/html/resellers.html
@@ -52,10 +52,14 @@ <h1>[$391]</h1>
                    <img alt="" src="{staticpath}images/mega/payments/retina/paypal-64.png" class="resellers-payment" />
 				   <img alt="" src="{staticpath}images/mega/payments/retina/bitcoin-64.png" class="resellers-payment" />
               </a>
-              <a href="https://bitvoucher.co/" target="_blank" class="resellers-link">
-                   <img alt="" class="resellers-logo" src="{staticpath}images/mega/resellers/new/bit-voucher.png" />
-				   <img alt="" src="{staticpath}images/mega/payments/retina/bitcoin-64.png" class="resellers-payment" />
+
+               <a href="http://mega.and1.tw/zh_tw/" target="_blank" class="resellers-link">
+                   <img alt="" class="resellers-logo" src="{staticpath}images/mega/resellers/new/6media_80.png" />
+                   <img alt="" src="{staticpath}images/mega/payments/retina/mastercard-64.png" class="resellers-payment" />
+                   <img alt="" src="{staticpath}images/mega/payments/retina/visa-64.png" class="resellers-payment" />
+                   <img alt="" src="{staticpath}images/mega/payments/retina/paypal-64.png" class="resellers-payment" />
               </a>
+
               <a href="http://www.pay.mobi/" target="_blank" class="resellers-link">
                    <img alt="" class="resellers-logo" src="{staticpath}images/mega/resellers/new/pay-mobi.png" />
                    <img alt="" src="{staticpath}images/mega/payments/retina/mastercard-64.png" class="resellers-payment" />
@@ -98,12 +102,7 @@ <h1>[$391]</h1>
                    <img alt="" src="{staticpath}images/mega/payments/retina/visa-64.png" class="resellers-payment" />
                    <img alt="" src="{staticpath}images/mega/payments/retina/paypal-64.png" class="resellers-payment" />
               </a>
-              <a href="http://mega.and1.tw/zh_tw/" target="_blank" class="resellers-link first">
-                   <img alt="" class="resellers-logo" src="{staticpath}images/mega/resellers/new/6media_80.png" />
-                   <img alt="" src="{staticpath}images/mega/payments/retina/mastercard-64.png" class="resellers-payment" />
-                   <img alt="" src="{staticpath}images/mega/payments/retina/visa-64.png" class="resellers-payment" />
-                   <img alt="" src="{staticpath}images/mega/payments/retina/paypal-64.png" class="resellers-payment" />
-              </a>
+
               <div class="clear"></div>
             </div>
       </div>

diff --git a/index.js b/index.js
@@ -548,12 +548,21 @@ function init_page()
 			document.location.hash = 'help/sync';
 		});
 
+
 		$('#syncanim').unbind('click');
 		$('#syncanim').bind('click',function(e)
 		{
-			document.location = 'https://mega.co.nz/MEGAsyncSetup.exe';
+			$('.sync-button').click();
 		});
 
+
+		/*
+		$('#syncanim').css('height','');
+		$('#syncanim').css('width','');		
+		$('#syncanim').addClass('sync-main-img');
+		*/
+
+
 		if (typeof swiffy == 'undefined' && !silent_loading)
 		{
 			silent_loading=function()
@@ -574,6 +583,7 @@ function init_page()
 				$('#syncanim svg').css('cursor','pointer');
 			},500);
 		}
+
 	}
 	else if (page == 'mobile')
 	{

diff --git a/js/mads.js b/js/mads.js
diff --git a/lang/bg.json b/lang/bg.json
diff --git a/lang/bs.json b/lang/bs.json
diff --git a/lang/ca.json b/lang/ca.json
diff --git a/lang/ct.json b/lang/ct.json
diff --git a/lang/de.json b/lang/de.json
diff --git a/lang/el.json b/lang/el.json
diff --git a/lang/es.json b/lang/es.json
diff --git a/lang/hi.json b/lang/hi.json
diff --git a/lang/hu.json b/lang/hu.json
diff --git a/lang/id.json b/lang/id.json
diff --git a/lang/jp.json b/lang/jp.json
diff --git a/lang/sr.json b/lang/sr.json
diff --git a/lang/tl.json b/lang/tl.json
diff --git a/mega.crx b/mega.crx
diff --git a/mega.xpi b/mega.xpi
diff --git a/update.rdf b/update.rdf
@@ -14,9 +14,9 @@
                    NS1:minVersion="4.0"
                    NS1:maxVersion="30.*"
                    NS1:updateLink="http://eu.static.mega.co.nz/mega.xpi"
-                   NS1:updateHash="sha256:92aae19b00461db63759d607d049886ac55d2102b08162669bfa36722fd50df0" />
+                   NS1:updateHash="sha256:0a9c6251aff78cceaba682eb697f53c7c4971e977af4e4f498c250202392c9d2" />
   <RDF:Description RDF:about="rdf:#$IIU611"
-                   NS1:version="2.0.122">
+                   NS1:version="2.0.124">
     <NS1:targetApplication RDF:resource="rdf:#$LIU611"/>
   </RDF:Description>
 </RDF:RDF>