You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/09/14 23:45:29 UTC
[14/16] usergrid git commit: Fix issue with portal login button not
handling failed logins properly when logging is disabled. Bump version.
Fix issue with portal login button not handling failed logins properly when logging is disabled. Bump version.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/7eb997b1
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/7eb997b1
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/7eb997b1
Branch: refs/heads/usergrid-103-upgrade-jersey
Commit: 7eb997b1c550bbd1661e223570b18f4cf2ba84d7
Parents: ca32186
Author: Michael Russo <mi...@gmail.com>
Authored: Fri Sep 11 16:59:40 2015 -0700
Committer: Michael Russo <mi...@gmail.com>
Committed: Fri Sep 11 16:59:40 2015 -0700
----------------------------------------------------------------------
portal/bower.json | 2 +-
portal/js/libs/usergrid.sdk.js | 8 +++++---
portal/package.json | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/7eb997b1/portal/bower.json
----------------------------------------------------------------------
diff --git a/portal/bower.json b/portal/bower.json
index 3c4784c..7ffb4ff 100644
--- a/portal/bower.json
+++ b/portal/bower.json
@@ -1,6 +1,6 @@
{
"name": "usergrid-portal",
- "version": "2.0.17",
+ "version": "2.0.18",
"ignore": [
".jshintrc",
"**/*.txt",
http://git-wip-us.apache.org/repos/asf/usergrid/blob/7eb997b1/portal/js/libs/usergrid.sdk.js
----------------------------------------------------------------------
diff --git a/portal/js/libs/usergrid.sdk.js b/portal/js/libs/usergrid.sdk.js
index 795e3e2..d527ea0 100755
--- a/portal/js/libs/usergrid.sdk.js
+++ b/portal/js/libs/usergrid.sdk.js
@@ -774,8 +774,10 @@
var user = {};
var organizations = {};
var applications = {};
- if (err && self.logging) {
- console.log('error trying to log user in');
+ if (err ) {
+ if(self.logging) {
+ console.log('error trying to log user in');
+ }
} else {
var options = {
client: self,
@@ -2563,4 +2565,4 @@
return tail.join("&");
}
-})(window, sessionStorage);
\ No newline at end of file
+})(window, sessionStorage);
http://git-wip-us.apache.org/repos/asf/usergrid/blob/7eb997b1/portal/package.json
----------------------------------------------------------------------
diff --git a/portal/package.json b/portal/package.json
index d91ec7a..e36a910 100644
--- a/portal/package.json
+++ b/portal/package.json
@@ -1,6 +1,6 @@
{
"name": "usergrid",
- "version": "2.0.17",
+ "version": "2.0.18",
"packageName": "appsvc-ui",
"description": "full usergrid portal",
"main": "./scripts/web-server.js",