airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [33/33] airavata-php-gateway git commit: merging changes from develop
Date Fri, 04 Dec 2015 19:56:57 GMT
merging changes from 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/6f6aae0f
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/6f6aae0f
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/6f6aae0f

Branch: refs/heads/master
Commit: 6f6aae0fd914a3d4a145f3b6d3b8f4ba90e54011
Parents: 5720922 93eb29d
Author: smarru <smarru@apache.org>
Authored: Fri Dec 4 14:56:12 2015 -0500
Committer: smarru <smarru@apache.org>
Committed: Fri Dec 4 14:56:12 2015 -0500

----------------------------------------------------------------------
 app/config/app.php                              |    2 +
 app/config/packages/markdown/config.php         |   30 +
 app/controllers/AccountController.php           |    4 +-
 app/controllers/AdminController.php             |   71 +-
 app/controllers/ExperimentController.php        |   34 +-
 app/controllers/GatewayprofileController.php    |    5 +-
 app/controllers/StorageresourceController.php   |  191 +
 app/libraries/AdminUtilities.php                |   20 +
 app/libraries/Airavata/API/Airavata.php         | 6175 ++++++++++++------
 .../Model/AppCatalog/ComputeResource/Types.php  |  943 +--
 .../Model/AppCatalog/GatewayProfile/Types.php   |   50 +-
 .../Model/AppCatalog/StorageResource/Types.php  |  232 +
 .../Airavata/Model/Data/Movement/Types.php      |  742 +++
 .../Airavata/Model/Experiment/Types.php         |   23 +
 app/libraries/Airavata/Model/Process/Types.php  |   23 +
 app/libraries/Airavata/Model/Task/Types.php     |    2 +
 app/libraries/CRUtilities.php                   |   36 +-
 app/libraries/ExperimentUtilities.php           |  121 +-
 app/libraries/SRUtilities.php                   |  408 ++
 app/routes.php                                  |   39 +-
 app/views/account/dashboard.blade.php           |  220 +
 app/views/admin/dashboard.blade.php             |  116 -
 app/views/admin/manage-credentials.blade.php    |   88 +-
 app/views/admin/manage-experiments.blade.php    |   56 +-
 app/views/admin/manage-gateway.blade.php        |   86 +-
 app/views/experiment/summary.blade.php          |    6 +-
 app/views/layout/basic.blade.php                |    9 +-
 app/views/layout/fixed-scripts.blade.php        |    2 +
 app/views/partials/dashboard-block.blade.php    |   56 +-
 .../partials/experiment-container.blade.php     |  173 +-
 app/views/partials/experiment-info.blade.php    |  182 +-
 app/views/partials/experiment-inputs.blade.php  |    2 +-
 .../partials/gateway-preferences.blade.php      |   12 +
 app/views/resource/edit.blade.php               |   25 +-
 app/views/storage-resource/browse.blade.php     |  159 +
 app/views/storage-resource/create.blade.php     |   43 +
 app/views/storage-resource/edit.blade.php       |  415 ++
 app/views/storage-resource/view.blade.php       |  379 ++
 composer.bat                                    |    1 +
 composer.json                                   |    4 +-
 public/css/admin.css                            |   11 +
 public/js/script.js                             |    8 +
 42 files changed, 7804 insertions(+), 3400 deletions(-)
----------------------------------------------------------------------



Mime
View raw message