You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by nd...@apache.org on 2015/09/01 21:08:55 UTC
[1/2] airavata-php-gateway git commit: Addition of Auth Token to
register App Interface.
Repository: airavata-php-gateway
Updated Branches:
refs/heads/master e892f8b40 -> 088dfff02
Addition of Auth Token to register App Interface.
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/2b07c409
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/2b07c409
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/2b07c409
Branch: refs/heads/master
Commit: 2b07c409f79fc86aff207a5b9f063087c9b1db94
Parents: f2a1a74
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Thu Aug 27 16:44:18 2015 -0400
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Thu Aug 27 16:44:18 2015 -0400
----------------------------------------------------------------------
app/libraries/AppUtilities.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2b07c409/app/libraries/AppUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/AppUtilities.php b/app/libraries/AppUtilities.php
index ea9926f..b504d57 100644
--- a/app/libraries/AppUtilities.php
+++ b/app/libraries/AppUtilities.php
@@ -104,7 +104,7 @@ class AppUtilities
}
Airavata::updateApplicationInterface(Session::get('authz-token'), $appInterfaceValues["app-interface-id"], $appInterface);
} else {
- Airavata::getApplicationInterface(Session::get('authz-token'), Airavata::registerApplicationInterface(Session::get("gateway_id"), $appInterface));
+ Airavata::getApplicationInterface(Session::get('authz-token'), Airavata::registerApplicationInterface(Session::get('authz-token'), Session::get("gateway_id"), $appInterface));
}
//print_r( "App interface has been created.");
}
[2/2] airavata-php-gateway git commit: Merge branch 'master' of
https://github.com/apache/airavata-php-gateway
Posted by nd...@apache.org.
Merge branch 'master' of https://github.com/apache/airavata-php-gateway
Conflicts:
app/libraries/AppUtilities.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/088dfff0
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/088dfff0
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/088dfff0
Branch: refs/heads/master
Commit: 088dfff02f749a95d5e28ae767ccd556e2121d43
Parents: 2b07c40 e892f8b
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Tue Sep 1 12:03:42 2015 -0400
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Tue Sep 1 12:03:42 2015 -0400
----------------------------------------------------------------------
app/controllers/AccountController.php | 7 +
app/controllers/ExperimentController.php | 4 +-
app/libraries/AdminUtilities.php | 2 +-
app/libraries/Airavata/API/Airavata.php | 423 +++++++++++++++++++
app/libraries/AppUtilities.php | 6 +-
app/libraries/CRUtilities.php | 45 +-
app/libraries/ExperimentUtilities.php | 11 +-
.../partials/experiment-queue-block.blade.php | 10 +-
app/views/resource/edit.blade.php | 2 +-
app/views/resource/view.blade.php | 2 +-
public/js/script.js | 4 +-
11 files changed, 493 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/088dfff0/app/libraries/AppUtilities.php
----------------------------------------------------------------------