You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by be...@apache.org on 2014/01/05 09:56:14 UTC

[36/48] git commit: updated refs/heads/1960-paginate-all_dbs to ae4cae9

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/1960-paginate-all_dbs
Commit: a6763c7326de7eb22d201f7cbeaf6cbc6883f9af
Parents: 0def723
Author: suelockwood <de...@apache.org>
Authored: Thu Jan 2 10:55:52 2014 -0500
Committer: suelockwood <de...@apache.org>
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 \