Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-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 09D2D10FC0 for ; Thu, 2 Jan 2014 15:56:14 +0000 (UTC) Received: (qmail 15958 invoked by uid 500); 2 Jan 2014 15:55:58 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 15800 invoked by uid 500); 2 Jan 2014 15:55:50 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 15704 invoked by uid 99); 2 Jan 2014 15:55:42 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Jan 2014 15:55:42 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A1AAD911DFC; Thu, 2 Jan 2014 15:55:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: deathbear@apache.org To: commits@couchdb.apache.org Date: Thu, 02 Jan 2014 15:55:47 -0000 Message-Id: <35edc7850d334bbe8650fae527e3a5c7@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [7/7] git commit: updated refs/heads/master to a6763c7 New Fauxton Build. Added Ace Editor files to Makefile.am Updated settings.json.default to have the correct release root Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/a6763c73 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/a6763c73 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/a6763c73 Branch: refs/heads/master Commit: a6763c7326de7eb22d201f7cbeaf6cbc6883f9af Parents: 0def723 Author: suelockwood Authored: Thu Jan 2 10:55:52 2014 -0500 Committer: suelockwood Committed: Thu Jan 2 10:55:52 2014 -0500 ---------------------------------------------------------------------- share/Makefile.am | 5 + share/www/fauxton/css/index.css | 4 +- share/www/fauxton/js/ace/mode-javascript.js | 886 ++ share/www/fauxton/js/ace/mode-json.js | 578 + .../www/fauxton/js/ace/theme-crimson_editor.js | 148 + share/www/fauxton/js/ace/worker-javascript.js | 10088 +++++++++++++++++ share/www/fauxton/js/ace/worker-json.js | 2271 ++++ share/www/fauxton/js/require.js | 67 +- src/fauxton/settings.json.default | 2 +- 9 files changed, 14014 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/a6763c73/share/Makefile.am ---------------------------------------------------------------------- diff --git a/share/Makefile.am b/share/Makefile.am index be0188c..84b91cb 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -90,6 +90,11 @@ nobase_dist_localdata_DATA = \ www/fauxton/img/minilogo.png \ www/fauxton/index.html \ www/fauxton/js/require.js \ + www/fauxton/js/ace/mode-javascript.js \ + www/fauxton/js/ace/mode-json.js \ + www/fauxton/js/ace/theme-crimson_editor.js \ + www/fauxton/js/ace/worker-javascript.js \ + www/fauxton/js/ace/worker-json.js \ www/favicon.ico \ www/image/add.png \ www/image/apply.gif \