Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E106C1846B for ; Tue, 1 Mar 2016 19:20:43 +0000 (UTC) Received: (qmail 49623 invoked by uid 500); 1 Mar 2016 19:20:40 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 49457 invoked by uid 500); 1 Mar 2016 19:20:40 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 49089 invoked by uid 99); 1 Mar 2016 19:20:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Mar 2016 19:20:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 65F29E69FA; Tue, 1 Mar 2016 19:20:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: scnakandala@apache.org To: commits@airavata.apache.org Date: Tue, 01 Mar 2016 19:20:53 -0000 Message-Id: <4260e5a8ebed4496a9e118e960b198e0@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [14/15] airavata-php-gateway git commit: Merge remote-tracking branch 'origin/develop' into develop Merge remote-tracking branch 'origin/develop' 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/bcf167a5 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/bcf167a5 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/bcf167a5 Branch: refs/heads/master Commit: bcf167a5cf3de3edfe40909ee2b8d7556f0a9d6a Parents: 7aca00c 24df8b8 Author: scnakandala Authored: Tue Mar 1 14:18:26 2016 -0500 Committer: scnakandala Committed: Tue Mar 1 14:18:26 2016 -0500 ---------------------------------------------------------------------- app/controllers/AccountController.php | 8 + app/controllers/AdminController.php | 4 + app/controllers/ApplicationController.php | 12 +- app/controllers/ComputeResourceController.php | 18 ++ .../Model/AppCatalog/AppDeployment/Types.php | 33 --- .../Model/AppCatalog/ComputeResource/Types.php | 290 +++++++++++++------ .../Model/AppCatalog/GatewayProfile/Types.php | 23 ++ .../Model/AppCatalog/Parallelism/Types.php | 53 ++++ .../Airavata/Model/Experiment/Types.php | 67 +++-- app/libraries/AppUtilities.php | 6 + app/libraries/CRUtilities.php | 14 +- app/routes.php | 7 + app/views/account/dashboard.blade.php | 10 + app/views/account/request-allocation.blade.php | 70 +++++ app/views/admin/manage-gateway.blade.php | 2 +- app/views/application/interface.blade.php | 55 +++- .../compute-resource-preferences.blade.php | 13 + .../partials/resource-job-manager.blade.php | 41 +++ app/views/resource/browse.blade.php | 2 +- app/views/resource/edit.blade.php | 152 ++++------ app/views/storage-resource/browse.blade.php | 2 +- public/css/bootstrap.min.css | 6 +- public/js/interface.js | 10 + public/js/script.js | 18 +- 24 files changed, 676 insertions(+), 240 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bcf167a5/app/controllers/AccountController.php ----------------------------------------------------------------------