Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id DC360200B62 for ; Thu, 7 Jul 2016 21:27:07 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id DB13A160A8F; Thu, 7 Jul 2016 19:27:07 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 50627160A68 for ; Thu, 7 Jul 2016 21:27:07 +0200 (CEST) Received: (qmail 54650 invoked by uid 500); 7 Jul 2016 19:27:06 -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 53614 invoked by uid 99); 7 Jul 2016 19:27:05 -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; Thu, 07 Jul 2016 19:27:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9859BED49A; Thu, 7 Jul 2016 19:27:05 +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: Thu, 07 Jul 2016 19:27:24 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [20/50] [abbrv] airavata-php-gateway git commit: Merge remote-tracking branch 'origin/develop' into develop archived-at: Thu, 07 Jul 2016 19:27:08 -0000 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/e80f2a24 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e80f2a24 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e80f2a24 Branch: refs/heads/master Commit: e80f2a2419e8c94c9e03219f4146490bd2bc6456 Parents: 1384022 6b3c8f2 Author: scnakandala Authored: Wed Jun 1 12:47:45 2016 -0400 Committer: scnakandala Committed: Wed Jun 1 12:47:45 2016 -0400 ---------------------------------------------------------------------- app/controllers/AdminController.php | 12 +- app/libraries/AdminUtilities.php | 14 +- app/libraries/CommonUtilities.php | 99 +++++++---- app/views/admin/manage-notices.blade.php | 172 +++++++++++-------- app/views/experiment/browse.blade.php | 1 - app/views/layout/basic.blade.php | 1 + .../compute-resource-preferences.blade.php | 1 + public/css/bootstrap.min.css | 18 +- public/js/time-conversion.js | 5 +- 9 files changed, 199 insertions(+), 124 deletions(-) ----------------------------------------------------------------------