airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [10/10] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into grouper-integration
Date Tue, 12 Jul 2016 23:37:39 GMT
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into
grouper-integration

# Conflicts:
#	app/libraries/Airavata/API/Airavata.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/7a3501a5
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/7a3501a5
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/7a3501a5

Branch: refs/heads/grouper-integration
Commit: 7a3501a5e33689976b99adc89125043b72dfcf3c
Parents: 3d00137 1496ebe
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Tue Jul 12 19:37:21 2016 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Tue Jul 12 19:37:21 2016 -0400

----------------------------------------------------------------------
 app/config/pga_config_default_template.php      | 243 +++++++++++++
 app/controllers/AccountController.php           |  32 +-
 app/controllers/AdminController.php             |  25 +-
 app/controllers/ComputeResourceController.php   |   4 +
 app/libraries/Airavata/Model/User/Types.php     | 109 +++---
 .../Airavata/Model/Workspace/Types.php          | 339 +++++++++++--------
 app/libraries/CRUtilities.php                   |  12 +
 app/libraries/CommonUtilities.php               |   2 +
 app/views/account/dashboard.blade.php           |  72 +++-
 app/views/admin/manage-gateway.blade.php        |  43 +--
 app/views/home.blade.php                        |   2 +-
 app/views/layout/basic.blade.php                |  16 +-
 app/views/partials/add-gateway-block.blade.php  |  40 +++
 13 files changed, 671 insertions(+), 268 deletions(-)
----------------------------------------------------------------------



Mime
View raw message