Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-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 10FB610D88 for ; Fri, 19 Apr 2013 17:27:58 +0000 (UTC) Received: (qmail 71079 invoked by uid 500); 19 Apr 2013 17:27:54 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 71054 invoked by uid 500); 19 Apr 2013 17:27:54 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 69356 invoked by uid 99); 19 Apr 2013 17:27:51 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Apr 2013 17:27:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5E8E3324DA2; Fri, 19 Apr 2013 17:27:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Date: Fri, 19 Apr 2013 17:28:12 -0000 Message-Id: <90d1474e9d9c4f8481edd1d51c63bffd@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [23/23] git commit: updated refs/heads/master to fc08c23 Merge branch 'ui-mixed-zone-management' Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fc08c237 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fc08c237 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fc08c237 Branch: refs/heads/master Commit: fc08c2372ca80c6a1f8e4ecfcc2e2a77e64589a9 Parents: 4a3a9df 355b910 Author: Brian Federle Authored: Fri Apr 19 10:25:39 2013 -0700 Committer: Brian Federle Committed: Fri Apr 19 10:25:39 2013 -0700 ---------------------------------------------------------------------- ui/css/cloudstack3.css | 59 ++++++++++++- ui/index.jsp | 4 +- ui/scripts/instanceWizard.js | 37 ++++++-- ui/scripts/network.js | 46 ++-------- ui/scripts/storage.js | 44 +++++++-- ui/scripts/templates.js | 134 ++++++++++++++++++++------- ui/scripts/ui-custom/projectSelect.js | 66 ++++++++++++++ ui/scripts/ui-custom/projects.js | 6 +- ui/scripts/ui-custom/zoneFilter.js | 39 ++++++++ 9 files changed, 340 insertions(+), 95 deletions(-) ----------------------------------------------------------------------