Merge branch 'master' into new-map-data

code/boot.js

@@ -444,6 +444,7 @@ function boot() {
     shadowSize: new L.Point(41, 41)
   }});
 
+  window.setupIdle();
   window.setupTaphold();
   window.setupStyles();
   window.setupDialogs();

code/idle.js

@@ -44,8 +44,11 @@ var idleMouseMove = function(e) {
   }
 }
 
-$('body').keypress(idleReset);
+window.setupIdle = function() {
-$('body').mousemove(idleMouseMove);
+  $('body').keypress(idleReset);
+  $('body').mousemove(idleMouseMove);
+}
+
 
 window.isIdle = function() {
   return window.idleTime >= window._idleTimeLimit;

mobile/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.cradle.iitc_mobile"
-          android:versionCode="37"
+          android:versionCode="39"
-          android:versionName="0.5.4.2">
+          android:versionName="0.5.5">
 
     <uses-sdk
         android:minSdkVersion="14"

mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java

@@ -137,7 +137,7 @@ public class IITC_WebViewClient extends WebViewClient {
         // Since the mobile client injects IITC by replacing the gen_dashboard
         // file, IITC runs to early. The document.ready delays IITC long enough
         // so it boots correctly.
-        this.mIitcScript = "$(document).ready(function(){" + js + "});";
+        this.mIitcScript = "setTimeout(function(){" + js + "},1);";
 
     }
 

website/page/faq.php

@@ -2,6 +2,23 @@
 
 <ul>
 
+<li>
+<h4 id="moblie-login">Login on mobile doesn't work!</h4>
+<p>
+Many users are seeing the error message <b>Error: Server Error</b> when attempting to log in on mobile.
+To get past this and log in successfully, you can try to
+<ol>
+<li>Exit IITC and try again. Some people have success after a number of tries, <i>or</i></li>
+<li>Cancel when asked to choose an account, and manually enter your email address and password into the web page</li>
+</ol>
+</p>
+<p>
+As far as we can tell this isn't an IITC Mobile issue - using the Chrome browser on android, which also supports
+Google login, can give similar issues. Further discussion on this is happening in
+<a href="https://github.com/jonatkins/ingress-intel-total-conversion/issues/497">github issue #497</a>.
+</p>
+</li>
+
 <li>
 <h4 id="not-activated">I get a message saying my account isn't activated</h4>
 <p>

website/page/home.php

@@ -13,6 +13,17 @@ offers many more features. It is available for
 
 <h3>Latest news</h3>
 
+<h4>27th August 2013</h4>
+<p>
+Yet another critical IITC update, 0.13.4, and IITC Mobile 0.5.5, have been released. A few things in this build
+<ul>
+<li>Scoreboard plugin is broken - fix coming later</li>
+<li>No MU numbers shown in fields - the server no longer returns the data</li>
+<li>Other plugins may be broken too - limited testing has been done</li>
+</ul>
+Note: Briefly IITC Mobile 0.5.4.3 was available, but broken.
+</p>
+
 <h4>16th August 2013</h4>
 <p>
 IITC 0.13.3 and IITC Mobile 0.5.4.2 have been released. This is another critical update required to work

website/page/mobile.php

@@ -26,6 +26,7 @@ install from the link below.
 <p>
 IITC Mobile is still in the early stages of development. Many things do not yet work right. Major known issues are:
 <ol>
+<li>Some users get <b>Error: Server Error</b> when logging in. See the FAQ for possible workarounds.</li>
 <li>Some plugins do not work well, or at all, at this time.</li>
 <li>Serious issues exist on Android 4.0 devices.
 <a href="https://github.com/jonatkins/ingress-intel-total-conversion/issues/90">details</a>.</li>

website/page/news.php

@@ -1,5 +1,16 @@
 <h2>News</h2>
 
+<h4>27th August 2013</h4>
+<p>
+Yet another critical IITC update, 0.13.4, and IITC Mobile 0.5.5, have been released. A few things in this build
+<ul>
+<li>Scoreboard plugin is broken - fix coming later</li>
+<li>No MU numbers shown in fields - the server no longer returns the data</li>
+<li>Other plugins may be broken too - limited testing has been done</li>
+</ul>
+Note: Briefly IITC Mobile 0.5.4.3 was available, but broken.
+</p>
+
 <h4>16th August 2013</h4>
 <p>
 IITC 0.13.3 and IITC Mobile 0.5.4.2 have been released. This is another critical update required to work