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/4fa2e7fb Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/4fa2e7fb Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/4fa2e7fb Branch: refs/heads/master Commit: 4fa2e7fb8a1ad6eae7adcdd4cf1f0684330ef384 Parents: 47fed00 6aae243 Author: scnakandala <[email protected]> Authored: Mon Nov 9 11:55:03 2015 -0500 Committer: scnakandala <[email protected]> Committed: Mon Nov 9 11:55:03 2015 -0500 ---------------------------------------------------------------------- app/config/pga_config.php.template | 36 ++++++++++++++++++++++++++- app/libraries/CommonUtilities.php | 24 +++++++++++++----- app/views/layout/basic.blade.php | 20 +++++++++++++++ app/views/layout/fixed-scripts.blade.php | 15 +++++++---- 4 files changed, 83 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
