Merge remote-tracking branch 'origin/master'
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/d7e5b727 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/d7e5b727 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/d7e5b727 Branch: refs/heads/master Commit: d7e5b727ea4305a669b747160a3a0157576dac0d Parents: 42e8876 cf050d5 Author: scnakandala <[email protected]> Authored: Mon Oct 12 23:18:08 2015 -0400 Committer: scnakandala <[email protected]> Committed: Mon Oct 12 23:18:08 2015 -0400 ---------------------------------------------------------------------- app/config/pga_config.php.template | 5 - app/controllers/GatewayprofileController.php | 11 ++ app/libraries/Airavata/API/Airavata.php | 101 +++++++++---------- app/libraries/CRUtilities.php | 8 +- app/libraries/ExperimentUtilities.php | 6 +- app/routes.php | 22 ++-- app/views/admin/manage-gateway.blade.php | 35 ++++++- app/views/layout/basic.blade.php | 7 ++ .../partials/gateway-preferences.blade.php | 9 ++ public/css/admin.css | 6 +- 10 files changed, 136 insertions(+), 74 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/d7e5b727/app/config/pga_config.php.template ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/d7e5b727/app/routes.php ----------------------------------------------------------------------
