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 'master' of https://github.com/apache/airavata-php-gateway
Date Tue, 01 Sep 2015 19:08:56 GMT
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 <nipunhere@gmail.com>
Authored: Tue Sep 1 12:03:42 2015 -0400
Committer: Nipurn Doshi <nipunhere@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
----------------------------------------------------------------------


Mime
View raw message