Return-Path: X-Original-To: apmail-climate-commits-archive@minotaur.apache.org Delivered-To: apmail-climate-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 850EE1123C for ; Mon, 4 Aug 2014 15:14:37 +0000 (UTC) Received: (qmail 27747 invoked by uid 500); 4 Aug 2014 15:14:37 -0000 Delivered-To: apmail-climate-commits-archive@climate.apache.org Received: (qmail 27711 invoked by uid 500); 4 Aug 2014 15:14:37 -0000 Mailing-List: contact commits-help@climate.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@climate.apache.org Delivered-To: mailing list commits@climate.apache.org Received: (qmail 27702 invoked by uid 99); 4 Aug 2014 15:14:37 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Aug 2014 15:14:37 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E44A9889AC2; Mon, 4 Aug 2014 15:14:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: joyce@apache.org To: commits@climate.apache.org Date: Mon, 04 Aug 2014 15:14:37 -0000 Message-Id: <659b27bd613943039e2e191b10eaf758@git.apache.org> In-Reply-To: <784457a1f77b4c0d891372c024237a38@git.apache.org> References: <784457a1f77b4c0d891372c024237a38@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Resolve CLIMATE-500. Merge PR #95 Resolve CLIMATE-500. Merge PR #95 Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/e3431831 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/e3431831 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/e3431831 Branch: refs/heads/master Commit: e3431831919f17138098aed07a84233177024f22 Parents: 74699f4 5ea18ff Author: Michael Joyce Authored: Mon Aug 4 08:14:18 2014 -0700 Committer: Michael Joyce Committed: Mon Aug 4 08:14:18 2014 -0700 ---------------------------------------------------------------------- ocw-ui/frontend/app/css/app.css | 4 +-- ocw-ui/frontend/app/css/lib/timeline.css | 24 ++++++++++++++ ocw-ui/frontend/app/index.html | 34 ++++++++++---------- ocw-ui/frontend/app/partials/main.html | 18 +++++++++++ ocw-ui/frontend/app/partials/modelSelect.html | 32 +++++++++--------- .../frontend/app/partials/results.detail.html | 19 +++++++++++ ocw-ui/frontend/app/partials/results.html | 19 +++++++++++ ocw-ui/frontend/app/partials/results.list.html | 19 +++++++++++ .../app/partials/selectObservation.html | 34 ++++++++++---------- ocw-ui/frontend/app/partials/selectRcmed.html | 34 ++++++++++---------- 10 files changed, 168 insertions(+), 69 deletions(-) ----------------------------------------------------------------------