From: Robert Kaiser <kairo@kairo.at>
Date: Mon, 18 Sep 2017 00:56:13 +0000 (+0200)
Subject: Merge branch 'master' of linz:/srv/git/lantea
X-Git-Tag: production~42
X-Git-Url: https://git-public.kairo.at//?a=commitdiff_plain;h=070d28b52b712a9067c29e6a358d39d2c3816048;hp=-c;p=lantea.git

Merge branch 'master' of linz:/srv/git/lantea
---

070d28b52b712a9067c29e6a358d39d2c3816048
diff --combined js/ui.js
index 1ddf65a,a419962..d8953ad
--- a/js/ui.js
+++ b/js/ui.js
@@@ -171,7 -171,7 +171,7 @@@ function prepareLoginButton(aCallback) 
            }
          }
          else {
-           console.log("Backend issue fetching OAuth state.");
+           console.log("Backend error " + aStatus + " fetching OAuth state: " + aResult["message"]);
          }
          if (aCallback) { aCallback(); }
        },
@@@ -760,7 -760,6 +760,7 @@@ function fetchBackend(aEndpoint, aMetho
      }
    };
    XHR.open(aMethod, gBackendURL + aEndpoint, true);
 +  XHR.withCredentials = "true";
    //XHR.setRequestHeader("Accept", "application/json");
    try {
      XHR.send(aSendData); // Send actual form data.