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 2017/02/13 00:28:54 UTC
[2/2] airavata-php-gateway git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
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/f199d9b8
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/f199d9b8
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/f199d9b8
Branch: refs/heads/develop
Commit: f199d9b8b8c87117e6c8f457836167e20ab6b046
Parents: db5eba4 9765c1e
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Sun Feb 12 16:28:14 2017 -0800
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Sun Feb 12 16:28:14 2017 -0800
----------------------------------------------------------------------
app/config/pga_config.php.template | 8 +++
app/controllers/AccountController.php | 24 +++++--
app/controllers/AdminController.php | 65 ++++++++++--------
app/controllers/ExperimentController.php | 6 +-
app/libraries/CommonUtilities.php | 4 ++
app/views/account/dashboard.blade.php | 5 ++
app/views/admin/manage-gateway.blade.php | 70 +++++++++-----------
.../compute-resource-preferences.blade.php | 2 +-
app/views/storage-resource/edit.blade.php | 1 +
9 files changed, 113 insertions(+), 72 deletions(-)
----------------------------------------------------------------------