[3/3] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop

2017-05-18 Thread ndoshi
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/e338c824
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e338c824
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e338c824

Branch: refs/heads/develop
Commit: e338c824b28074fea66bbe746cba8b3c62215590
Parents: 0a125c1 7a7e2f9
Author: Nipurn Doshi 
Authored: Thu May 18 18:30:25 2017 -0700
Committer: Nipurn Doshi 
Committed: Thu May 18 18:30:25 2017 -0700

--
 app/controllers/AdminController.php | 2 +-
 app/controllers/ComputeResourceController.php   | 4 +
 app/controllers/ExperimentController.php|   128 +-
 app/controllers/GatewayController.php   |40 -
 app/controllers/ProjectController.php   | 8 +-
 app/libraries/Airavata/API/Airavata.php | 11335 ++---
 app/libraries/Airavata/API/Error/Types.php  |82 +
 .../Model/AppCatalog/AppDeployment/Types.php|25 +-
 .../Model/AppCatalog/ComputeResource/Types.php  |94 +
 .../Airavata/Model/Application/Io/Types.php | 6 +-
 .../Airavata/Model/Data/Replica/Types.php   |   572 +-
 .../Airavata/Model/Messaging/Event/Types.php| 2 +
 app/libraries/Airavata/Model/User/Types.php |   279 +-
 app/libraries/ExperimentUtilities.php   |20 +-
 app/libraries/ProjectUtilities.php  |13 +-
 app/libraries/SharingUtilities.php  |21 +-
 app/resources/security/idp_scigap_org.pem   |   156 +-
 app/routes.php  | 2 +
 app/storage/.gitignore  | 0
 app/storage/cache/.gitignore| 0
 app/storage/logs/.gitignore | 0
 app/storage/meta/.gitignore | 0
 app/storage/sessions/.gitignore | 0
 app/storage/views/.gitignore| 0
 app/views/account/dashboard.blade.php   | 3 +-
 app/views/experiment/edit.blade.php | 2 +-
 app/views/home.blade.php| 2 +-
 app/views/partials/deployment-block.blade.php   |15 +
 app/views/partials/experiment-inputs.blade.php  | 3 +-
 .../partials/experiment-queue-block.blade.php   |   127 +-
 app/views/project/create.blade.php  | 1 +
 app/views/resource/edit.blade.php   |20 +
 app/views/resource/view.blade.php   |20 +
 public/js/sharing/share.js  | 2 +-
 34 files changed, 7915 insertions(+), 5069 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e338c824/app/views/home.blade.php
--



[3/3] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop

2016-10-13 Thread ndoshi
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/926d55ac
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/926d55ac
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/926d55ac

Branch: refs/heads/develop
Commit: 926d55ac1f0a563bc818cd36499bcfc46d6a324e
Parents: f312af8 6254204
Author: Nipurn Doshi 
Authored: Thu Oct 13 12:19:36 2016 -0700
Committer: Nipurn Doshi 
Committed: Thu Oct 13 12:19:36 2016 -0700

--
 app/controllers/ProjectController.php   |   2 +-
 app/libraries/Airavata/API/Airavata.php | 287 +++
 app/libraries/CRUtilities.php   |   1 +
 app/routes.php  |   2 +-
 app/views/admin/manage-roles.blade.php  |  10 +-
 app/views/project/browse.blade.php  |   7 +-
 app/views/project/no-summary.blade.php  | 119 ---
 app/views/project/summary.blade.php | 119 +++
 8 files changed, 415 insertions(+), 132 deletions(-)
--




[3/3] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop

2016-09-15 Thread ndoshi
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/8e0f47a8
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/8e0f47a8
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/8e0f47a8

Branch: refs/heads/develop
Commit: 8e0f47a8b3c1f6580dfe60dbce9ec7ff3bbb057a
Parents: 73881fb 2565902
Author: Nipurn Doshi 
Authored: Thu Sep 15 22:50:47 2016 -0700
Committer: Nipurn Doshi 
Committed: Thu Sep 15 22:50:47 2016 -0700

--
 app/config/pga_config.php.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--




[3/3] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop

2016-07-04 Thread ndoshi
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/c7798cc3
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/c7798cc3
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/c7798cc3

Branch: refs/heads/develop
Commit: c7798cc303a5188db2789e22d599e819203a74ad
Parents: d14d073 7ba4571
Author: Nipurn Doshi 
Authored: Mon Jul 4 00:15:07 2016 -0700
Committer: Nipurn Doshi 
Committed: Mon Jul 4 00:15:07 2016 -0700

--
 app/views/admin/manage-credentials.blade.php | 24 +++
 1 file changed, 12 insertions(+), 12 deletions(-)
--




[3/3] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop

2016-04-19 Thread ndoshi
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/6763b302
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/6763b302
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/6763b302

Branch: refs/heads/develop
Commit: 6763b302d321c2eff162ac8d8cf8328f9224bd66
Parents: 41c31b3 289b9e4
Author: Nipurn Doshi 
Authored: Tue Apr 19 14:14:23 2016 -0400
Committer: Nipurn Doshi 
Committed: Tue Apr 19 14:14:23 2016 -0400

--
 app/controllers/AccountController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6763b302/app/controllers/AccountController.php
--



[3/3] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop

2016-04-01 Thread ndoshi
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/4749da91
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/4749da91
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/4749da91

Branch: refs/heads/develop
Commit: 4749da9184e92ed24838f7929ffded67bb0c458e
Parents: e4a7b19 57ccfb3
Author: Nipurn Doshi 
Authored: Fri Apr 1 12:45:25 2016 -0400
Committer: Nipurn Doshi 
Committed: Fri Apr 1 12:45:25 2016 -0400

--
 app/views/partials/experiment-info.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--




[3/3] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop

2016-03-18 Thread ndoshi
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/492b8218
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/492b8218
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/492b8218

Branch: refs/heads/develop
Commit: 492b82187a965a2b50b123852d8988e8e3b63666
Parents: 0cec2b4 44539fc
Author: Nipurn Doshi 
Authored: Wed Mar 16 15:32:57 2016 -0400
Committer: Nipurn Doshi 
Committed: Wed Mar 16 15:32:57 2016 -0400

--
 app/controllers/AdminController.php   | 16 --
 app/libraries/ExperimentUtilities.php |  2 +-
 app/libraries/Wsis/Stubs/UserStoreManager.php | 18 +--
 app/views/admin/manage-users.blade.php| 62 +++---
 4 files changed, 57 insertions(+), 41 deletions(-)
--




[3/3] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop

2016-02-26 Thread ndoshi
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/ba651fe2
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/ba651fe2
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/ba651fe2

Branch: refs/heads/develop
Commit: ba651fe2b7ca9d09dd6a5b8fc90dfc276dc5c3a0
Parents: 20458c6 ac25081
Author: Nipurn Doshi 
Authored: Fri Feb 26 15:07:03 2016 -0500
Committer: Nipurn Doshi 
Committed: Fri Feb 26 15:07:03 2016 -0500

--
 .../Model/AppCatalog/ComputeResource/Types.php  | 22 ++--
 1 file changed, 11 insertions(+), 11 deletions(-)
--




[3/3] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop

2016-02-10 Thread ndoshi
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/b5720467
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/b5720467
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/b5720467

Branch: refs/heads/develop
Commit: b57204671b6deec8532c361d20e33eb80cc8081f
Parents: e0195ad 667d071
Author: Nipurn Doshi 
Authored: Wed Feb 10 14:30:12 2016 -0500
Committer: Nipurn Doshi 
Committed: Wed Feb 10 14:30:12 2016 -0500

--
 app/config/pga_config.php.template| 15 ---
 app/controllers/AccountController.php | 28 +++-
 app/libraries/Wsis/Stubs/OAuthManager.php |  4 ++-
 app/routes.php|  2 ++
 app/views/account/verify-human.blade.php  | 36 ++
 5 files changed, 67 insertions(+), 18 deletions(-)
--