airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [12/12] airavata-php-gateway git commit: Merge remote-tracking branch 'origin/develop' into dreg-gateway
Date Wed, 15 Feb 2017 14:38:46 GMT
Merge remote-tracking branch 'origin/develop' into dreg-gateway


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/75929d77
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/75929d77
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/75929d77

Branch: refs/heads/dreg-gateway
Commit: 75929d7798e5a1bc2ff820d03b1ce85175408f8c
Parents: d5533b0 f199d9b
Author: Marcus Christie <machrist@iu.edu>
Authored: Wed Feb 15 09:36:06 2017 -0500
Committer: Marcus Christie <machrist@iu.edu>
Committed: Wed Feb 15 09:36:06 2017 -0500

----------------------------------------------------------------------
 app/config/pga_config.php.template              |  8 +++
 app/controllers/AccountController.php           |  9 +--
 app/controllers/AdminController.php             | 65 ++++++++++--------
 app/libraries/CommonUtilities.php               |  4 ++
 app/views/account/dashboard.blade.php           |  5 ++
 app/views/admin/manage-gateway.blade.php        | 70 +++++++++-----------
 app/views/layout/basic.blade.php                | 10 ++-
 .../compute-resource-preferences.blade.php      |  2 +-
 app/views/partials/dashboard-block.blade.php    |  6 +-
 public/css/admin.css                            | 10 ++-
 10 files changed, 109 insertions(+), 80 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/75929d77/app/libraries/CommonUtilities.php
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/75929d77/app/views/account/dashboard.blade.php
----------------------------------------------------------------------


Mime
View raw message