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 6347D18F0D for ; Mon, 13 Jul 2015 17:30:26 +0000 (UTC) Received: (qmail 3448 invoked by uid 500); 13 Jul 2015 17:26:43 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 95203 invoked by uid 500); 13 Jul 2015 17:26:38 -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 93134 invoked by uid 99); 13 Jul 2015 17:24:56 -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; Mon, 13 Jul 2015 17:24:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5830EE08E0; Mon, 13 Jul 2015 17:24:56 +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: Mon, 13 Jul 2015 17:25:35 -0000 Message-Id: <667d5fc1db6a423ab70f151f51f00271@git.apache.org> In-Reply-To: <7459844f8cd2408f85fe0ba26643d85f@git.apache.org> References: <7459844f8cd2408f85fe0ba26643d85f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [41/42] airavata-php-gateway git commit: Merge branch 'master' into airavata-php-gateway-0.15-release Merge branch 'master' into airavata-php-gateway-0.15-release Conflicts: app/libraries/AppUtilities.php app/views/admin/manage-experiments.blade.php app/views/experiment/search.blade.php app/views/project/summary.blade.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/ac23deee Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/ac23deee Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/ac23deee Branch: refs/heads/airavata-php-gateway-0.15-release Commit: ac23deee47fa6c87105ecf7b25778c9c4b4652a7 Parents: 7b775c3 3f1fdd4 Author: Supun Nakandala Authored: Thu Jul 2 00:26:23 2015 +0530 Committer: Supun Nakandala Committed: Thu Jul 2 00:26:23 2015 +0530 ---------------------------------------------------------------------- app/controllers/AdminController.php | 25 +- app/libraries/AdminUtilities.php | 52 +- app/libraries/AppUtilities.php | 5 + app/libraries/ExperimentUtilities.php | 17 +- app/routes.php | 4 + app/views/admin/experiment-statistics.blade.php | 198 +++++++ app/views/admin/manage-experiments.blade.php | 580 ++++++++----------- app/views/experiment/search.blade.php | 175 ++---- .../partials/experiment-container.blade.php | 92 +++ app/views/project/summary.blade.php | 64 +- 10 files changed, 709 insertions(+), 503 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ac23deee/app/libraries/ExperimentUtilities.php ----------------------------------------------------------------------