airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndo...@apache.org
Subject [2/2] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
Date Wed, 13 Jul 2016 16:37:31 GMT
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into
develop

# Conflicts:
#	app/controllers/AccountController.php


Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/ec028e87
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/ec028e87
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/ec028e87

Branch: refs/heads/develop
Commit: ec028e87bff365f22b63871fd11de0ff25b46682
Parents: c751dfc a8be155
Author: Nipurn Doshi <nipunhere@gmail.com>
Authored: Wed Jul 13 09:37:08 2016 -0700
Committer: Nipurn Doshi <nipunhere@gmail.com>
Committed: Wed Jul 13 09:37:08 2016 -0700

----------------------------------------------------------------------
 app/controllers/AccountController.php | 10 +++++-----
 app/libraries/ProjectUtilities.php    |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ec028e87/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --cc app/controllers/AccountController.php
index 2b20f32,67fd160..a778165
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@@ -312,7 -312,6 +312,7 @@@ class AccountController extends BaseCon
                  Session::put("new-gateway-provider", true);
              }
          }
- 
++        
          $errors = array();
          if( Session::has("errors"))
              $errors = Session::get("errors");


Mime
View raw message